From 77aa446bc74b30cf95bf7fe8bed44ef7a55c0341 Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Tue, 10 Nov 2015 12:18:26 -0600
Subject: [PATCH] Rename OpenStack Supporting service files

It was renamed those files which correspond to supporting services. Moreover, it
was included the instruction to verify fix for installing the binaries of the
bundles.

Signed-off-by: Victor Morales <victor.morales@intel.com>
---
 source/index.rst                                   |  4 ++--
 source/openstack_installing_bundles.rst            |  6 +++---
 ...abase.rst => openstack_supporting-database.rst} |  4 +++-
 ...ging.rst => openstack_supporting-messaging.rst} | 14 +++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename source/{openstack_environment-database.rst => openstack_supporting-database.rst} (96%)
 rename source/{openstack_environment-messaging.rst => openstack_supporting-messaging.rst} (81%)

diff --git a/source/index.rst b/source/index.rst
index 0e7457fd..20a06979 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -42,8 +42,8 @@ OpenStack* implementation
    openstack_bundle_and_service_summary
    openstack_sys_req_and_pw_summary
    openstack_installing_bundles
-   openstack_environment-database
-   openstack_environment-messaging
+   openstack_supporting-database
+   openstack_supporting-messaging
    openstack_identity
    openstack_identity-openrc
    openstack_image
diff --git a/source/openstack_installing_bundles.rst b/source/openstack_installing_bundles.rst
index 2201098f..0261105b 100644
--- a/source/openstack_installing_bundles.rst
+++ b/source/openstack_installing_bundles.rst
@@ -8,8 +8,8 @@ for your environment.
 
 To install, continue with the following topics:
 
-* `Database <openstack_environment-database.html>`_
-* `Message queue <openstack_environment-messaging.html>`_
+* `Database <openstack_supporting-database.html>`_
+* `Message queue <openstack_supporting-messaging.html>`_
 * `OpenStack Identity <openstack_identity.html>`_
 * `Create OpenStack client environment scripts <openstack_identity-openrc.html>`_
 * `OpenStack Image <openstack_image.html>`_
@@ -19,4 +19,4 @@ To install, continue with the following topics:
 * `OpenStack Networking <openstack_networking.html>`_
 * `OpenStack Orchestration <openstack_orchestration.html>`_
 * `OpenStack Telemetry <openstack_telemetry.html>`_
-* `OpenStack Object Storage <openstack_object_storage.html>`_
\ No newline at end of file
+* `OpenStack Object Storage <openstack_object_storage.html>`_
diff --git a/source/openstack_environment-database.rst b/source/openstack_supporting-database.rst
similarity index 96%
rename from source/openstack_environment-database.rst
rename to source/openstack_supporting-database.rst
index 84b9e017..e58ee1a4 100644
--- a/source/openstack_environment-database.rst
+++ b/source/openstack_supporting-database.rst
@@ -11,8 +11,10 @@ Install and configure the database server
 #. Install MariaDB bundle::
 
      # clr_bundle_add database-mariadb
+     # swupd_verify --fix
 
-#. Create the ``/etc/mariadb/`` folder and the ``/etc/mariadb/openstack.cnf`` file::
+#. Create the ``/etc/mariadb/`` folder and the ``/etc/mariadb/openstack.cnf``
+   file::
 
      # mkdir /etc/mariadb
      # touch /etc/mariadb/openstack.cnf
diff --git a/source/openstack_environment-messaging.rst b/source/openstack_supporting-messaging.rst
similarity index 81%
rename from source/openstack_environment-messaging.rst
rename to source/openstack_supporting-messaging.rst
index 9f78c556..38109a87 100644
--- a/source/openstack_environment-messaging.rst
+++ b/source/openstack_supporting-messaging.rst
@@ -9,9 +9,10 @@ services. This guide implements the RabbitMQ message queue service.
 Install the message queue service
 ---------------------------------
 
-#. Install the message queue bundle::
+#. Install the message queue bundle.::
 
-      # clr_bundle_add message-broker-rabbitmq
+   # clr_bundle_add message-broker-rabbitmq
+   # swupd_verify --fix
 
 Configuring the message broker service
 --------------------------------------
@@ -19,25 +20,24 @@ Configuring the message broker service
 Complete the following steps to configure the message broker service:
 
 #. Message broker service needs to be able to resolve to itself. Add the
-   following line to ``/etc/hosts``::
+   following line to ``/etc/hosts``.::
 
     127.0.0.1 controller
 
 #. Start the message broker service and configure it to start when the
-   system boots::
+   system boots.::
 
     # systemctl enable rabbitmq-server.service
     # systemctl start rabbitmq-server.service
 
-#. Add the OpenStack user::
+#. Add the OpenStack user. Replace ``RABBIT_PASS`` with a suitable password.::
 
     # rabbitmqctl add_user openstack RABBIT_PASS
     Creating user openstack ...
     ...done.
 
-   Replace ``RABBIT_PASS`` with a suitable password.
 
-#. Permit configuration, write, and read access for the OpenStack user::
+#. Permit configuration, write, and read access for the OpenStack user.::
 
     # rabbitmqctl set_permissions openstack ".*" ".*" ".*"
     Setting permissions for user "openstack" in vhost "/" ...