Merge "Standardizing install guides"

3 files changed, 30 insertions, 38 deletions

diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst
index 5c182c10..e62d4087 100644
--- a/doc/source/install/install-obs.rst
+++ b/doc/source/install/install-obs.rst
@@ -43,8 +43,17 @@ Install and configure components
 
       # zypper install bind bind-utils
 
+#. Create an RNDC Key:
+
+   .. code-block:: console
+
+      # rndc-confgen -a -k designate -c /etc/designate/rndc.key -r /dev/urandom
+
 #. Add the following options in the ``/etc/named.conf`` file::
 
+      ...
+      include "/etc/designate/rndc.key";
+
       options {
           ...
           allow-new-zones yes;
@@ -54,23 +63,11 @@ Install and configure components
           allow-query { 127.0.0.1; };
       };
 
-#. Create an RNDC Key:
-
-   .. code-block:: console
-
-      # rndc-confgen -a -k designate -c /etc/designate/rndc.key -r /dev/urandom
-
-#. Add the key to ``/etc/named.conf``::
-
-      ...
-      include "/etc/designate/rndc.key";
-
       controls {
         inet 127.0.0.1 port 953
           allow { 127.0.0.1; } keys { "designate"; };
       };
 
-
 #. Start the DNS service and configure it to start when the system boots:
 
    .. code-block:: console
@@ -133,10 +130,10 @@ Install and configure components
 
    .. code-block:: console
 
-      # systemctl enable openstack-designate-central openstack-designate-api
-
       # systemctl start openstack-designate-central openstack-designate-api
 
+      # systemctl enable openstack-designate-central openstack-designate-api
+
 #. Create a pools.yaml file in ``/etc/designate/pools.yaml`` with the following
    contents:
 
@@ -197,6 +194,6 @@ Install and configure components
 
    .. code-block:: console
 
-      # systemctl enable openstack-designate-worker openstack-designate-producer openstack-designate-mdns
-
       # systemctl start openstack-designate-worker openstack-designate-producer openstack-designate-mdns
+
+      # systemctl enable openstack-designate-worker openstack-designate-producer openstack-designate-mdns
diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst
index 70ddad61..08aecba7 100644
--- a/doc/source/install/install-rdo.rst
+++ b/doc/source/install/install-rdo.rst
@@ -43,8 +43,17 @@ Install and configure components
 
       # yum install bind bind-utils
 
+#. Create an RNDC Key:
+
+   .. code-block:: console
+
+      # rndc-confgen -a -k designate -c /etc/designate/rndc.key -r /dev/urandom
+
 #. Add the following options in the ``/etc/named.conf`` file::
 
+      ...
+      include "/etc/designate/rndc.key";
+
       options {
           ...
           allow-new-zones yes;
@@ -54,23 +63,11 @@ Install and configure components
           allow-query { 127.0.0.1; };
       };
 
-#. Create an RNDC Key:
-
-   .. code-block:: console
-
-      # rndc-confgen -a -k designate -c /etc/designate/rndc.key -r /dev/urandom
-
-#. Add the key to ``/etc/named.conf``::
-
-      ...
-      include "/etc/designate/rndc.key";
-
       controls {
         inet 127.0.0.1 port 953
           allow { 127.0.0.1; } keys { "designate"; };
       };
 
-
 #. Start the DNS service and configure it to start when the system boots:
 
    .. code-block:: console
@@ -133,10 +130,10 @@ Install and configure components
 
    .. code-block:: console
 
-      # systemctl enable designate-central designate-api
-
       # systemctl start designate-central designate-api
 
+      # systemctl enable designate-central designate-api
+
 #. Create a pools.yaml file in ``/etc/designate/pools.yaml`` with the following
    contents:
 
@@ -197,6 +194,6 @@ Install and configure components
 
    .. code-block:: console
 
-      # systemctl enable designate-worker designate-producer designate-mdns
-
       # systemctl start designate-worker designate-producer designate-mdns
+
+      # systemctl enable designate-worker designate-producer designate-mdns
diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst
index fef0e8fe..2d0a251b 100644
--- a/doc/source/install/install-ubuntu.rst
+++ b/doc/source/install/install-ubuntu.rst
@@ -47,7 +47,7 @@ Install and configure components
 
    .. code-block:: console
 
-      # rndc-confgen -a -k designate -c /etc/designate/rndc.key
+      # rndc-confgen -a -k designate -c /etc/designate/rndc.key -r /dev/urandom
 
 #. Add the following options in the ``/etc/bind/named.conf.options`` file::
 
@@ -123,12 +123,12 @@ Install and configure components
 
         # su -s /bin/sh -c "designate-manage database sync" designate
 
-#. Restart the designate central and API services and configure them
+#. Start the designate central and API services and configure them
    to start when the system boots:
 
    .. code-block:: console
 
-      # systemctl restart designate-central designate-api
+      # systemctl start designate-central designate-api
 
       # systemctl enable designate-central designate-api
 
@@ -191,9 +191,7 @@ Install and configure components
 
    .. code-block:: console
 
-      # apt install designate-worker
-      # apt install designate-producer
-      # apt install designate-mdns
+      # apt install designate-worker designate-producer designate-mdns
 
 #. Start the designate and mDNS services and configure them to start when the
    system boots: