Merge pull request #806 from stackhpc/rabbitmq-use-systemd-units

Use systemctl  in RMQ hammer playbook and docs

Author: MoteHue

doc/source/operations/rabbitmq.rst

@@ -98,7 +98,7 @@ Stop all the OpenStack services which use RabbitMQ.
 
 .. code-block:: console
 
-  kayobe overcloud host command run --command "docker ps -a | egrep '(barbican|blazar|ceilometer|cinder|cloudkitty|designate|heat|ironic|keystone|magnum|manila|masakari|neutron|nova|octavia)' | awk '{ print \$NF }' | xargs docker stop"
+  kayobe overcloud host command run -b --command "systemctl -a | egrep '(barbican|blazar|ceilometer|cinder|cloudkitty|designate|heat|ironic|keystone|magnum|manila|masakari|neutron|nova|octavia)' | awk '{ print \$1 }' | xargs systemctl stop"
 
 Upgrade RabbitMQ.
 
@@ -136,7 +136,7 @@ procedure.
 
 .. code-block:: console
 
-  kayobe overcloud host command run --command "docker ps -a | egrep '(barbican|blazar|ceilometer|cinder|cloudkitty|designate|heat|ironic|keystone|magnum|manila|masakari|neutron|nova|octavia)' | awk '{ print \$NF }' | xargs docker start"
+  kayobe overcloud host command run -b --command "systemctl -a | egrep '(barbican|blazar|ceilometer|cinder|cloudkitty|designate|heat|ironic|keystone|magnum|manila|masakari|neutron|nova|octavia)' | awk '{ print \$1 }' | xargs systemctl start"
 
 Check to see if the expected queues are durable.
 
@@ -170,7 +170,7 @@ such as the following when other OpenStack services start::
     vhost '/': received 'true' but current is 'false'
 
 This may happen if a host is not in the inventory, leading to them not being
-targeted by the ``docker stop`` command. If this does happen, look for the
+targeted by the ``systemctl stop`` command. If this does happen, look for the
 hostname of the offending node in the queues created after the RabbitMQ reset.
 
 Once the rogue services have been stopped, reset the RabbitMQ cluster again to

etc/kayobe/ansible/rabbitmq-reset.yml

@@ -12,7 +12,6 @@
     - container_name: rabbitmq
   tasks:
     - name: Checking timedatectl status
-      become: true
       command: timedatectl status
       register: timedatectl_status
       changed_when: false
@@ -32,7 +31,7 @@
       register: inspection
 
     - name: Ensure the {{ container_name }} container is running
-      command: "docker start {{ container_name }}"
+      command: "systemctl start kolla-{{ container_name }}-container.service"
       when: inspection.stdout == 'false'
 
     - name: Wait for the {{ container_name }} container to reach state 'Running'
@@ -69,4 +68,4 @@
     # The following services can have problems if the cluster gets broken.
     - name: Restart OpenStack services
       shell: >-
-        docker ps -a | egrep '(cinder|heat|ironic|keystone|magnum|neutron|nova)' | awk '{ print $NF }' | xargs docker restart
+        systemctl -a | egrep '(cinder|heat|ironic|keystone|magnum|neutron|nova)' | awk '{ print $1 }' | xargs systemctl restart