diff --git a/bundles/openstack/deploy-openstack.rst b/bundles/openstack/deploy-openstack.rst
index 198b527c40b830651371ad4876b871e5e7e2aa3c..0342f72935499504c5a750fdeb715438977f52a8 100644
--- a/bundles/openstack/deploy-openstack.rst
+++ b/bundles/openstack/deploy-openstack.rst
@@ -2,31 +2,33 @@
GARR OpenStack Cloud
----------------------
-This is a collection of bundles to deploy the GARR OpenStack Cloud (Mitaka release) on Ubuntu 16.04 LTS, providing
-Dashboard, Compute, Network, Block Storage, Object Storage, Identity and Image services.
+This is a collection of bundles to deploy the GARR OpenStack Cloud (Ocata release) on Ubuntu 16.04 LTS, providing
+Dashboard, Compute, Network, Block Storage, Object Storage, Identity, Image and Telemetry services.
For historical reasons we still keep the *obsolete* versions around, but please note that those files
may disappear any time soon.
The current version also includes Nagios as well as a nice highlighting of the variables
-which need to be changed if you want to try the bundle: in addition to a global replacement of the
-string *STRSITE* with something identifying your site, most (if not all) variables you'd need to
+which need to be changed if you want to try the bundle: most (if not all) variables you'd need to
change are in the top part of the file and are marked with a comment starting with the EDIT keyword.
You are welcome to modify any other variable, too.
Requirements
------------
-The most up-to-date bundles are:
- - bundle_template.juju2.yaml, works with Juju 2.2, includes Nagios, relies on external Ceph cluster
- - bundle_template.juju2.cephlocal.yaml, works with Juju 2.2, includes Nagios, creates a Ceph cluster with OSD servers
+The current versions of the bundles are:
+ - bundle_template.yaml, works with Juju 2.2, includes Nagios, relies on external Ceph cluster
+ - bundle_template.cephlocal.yaml, works with Juju 2.2, includes Nagios, creates a Ceph cluster with OSD servers
on compute nodes, and MON server on controller nodes
-The two "obsolete" bundles are for Juju 2.0 and likely won't work with more recent Juju due to lack of support for default bindings.
-They reflect limitations of previous Juju version in other respects, for example in the separation between regular controller nodes
+The bundles marked juju-2.0 are for Juju 2.0 and likely won't work with more
+recent Juju due to lack of support for default bindings.
+They reflect limitations of previous Juju version in other respects, for example
+in the separation between regular controller nodes
(marked with *ctrl*) and controller nodes with public address (marked with *ctrl-pub*)
-The bundle is designed to run on bare metal using Juju with [MAAS]_ (Metal-as-a-Service); you will need to have setup a [MAAS]_
+The bundle is designed to run on bare metal using Juju with [MAAS]_ (Metal-as-a-Service);
+you will need to have setup a [MAAS]_
deployment with a minimum of 5 physical servers prior to using this bundle.
Servers should have:
@@ -46,7 +48,7 @@ The network configuration should match what was defined at MAAS level: specifica
Components
----------
-The current reference template bundle_template.juju2.2ctrl.yaml defines:
+The current reference template bundle_template.2ctrl.yaml defines:
- 2 nodes controller: these will host a variety of services, with and without public IP address
- 2 nodes compute: in the *cephlocal* version, these will also be the OSD servers
- 1 node neutron gw
@@ -64,12 +66,8 @@ Deployment
Prepare your own bundle
.......................
-The following command should provide you with a reasonable starting point for your specific case. In the following,
-*mysite* will be any string identifying your environment.
-
- cat bundle_template.juju2.yaml | sed -e 's/STRSITE/mysite/g' > bundle_mysite.yaml
-
-Edit the resulting file: as a minimum, you should uncomment and edit to suit your configuration all lines starting
+Edit the bundle to suite your needs: as a minimum, you should uncomment and edit
+to suit your configuration all lines starting
with **#EDIT#**. Moreover, you should pay attention to the following:
- check neutron configuration in the three charms neutron-api neutron-openvswitch neutron-gateway
- make sure the physical nodes have been properly labeled to match setting in the head of the bundle file
@@ -77,7 +75,7 @@ with **#EDIT#**. Moreover, you should pay attention to the following:
Deploy your bundle
..................
- juju deploy bundle_mysite.yaml
+ juju deploy ./bundle.yaml
and enjoy a looong coffee...
@@ -93,7 +91,7 @@ Install OpenStack client tools
In order to configure and use your cloud, you'll need to install the appropriate client tools:
- sudo apt-get -y install python-novaclient python-keystoneclient \
+ sudo apt -y install python-novaclient python-keystoneclient \
python-glanceclient python-neutronclient
Accessing the cloud