Reorder cinder service installs

The recommended order that services restart during an upgrade of cinder
is scheduler, volume, backup, and then api. Update the playbook so that
cinder services are also installed in that same order.

Also add back the reloading of services other than cinder-api, as the
misordering may have been the cause of high CPU usage in the past.

Depends-On: I6f39b4da6d4d8a3768f157c73970fe0177885ff3

Change-Id: I81874ffea0afd499228698422842da252fce7dc0

playbooks/os-cinder-install.yml

@@ -57,14 +57,6 @@
 
 
 
-- name: Install cinder API services
-  include: common-playbooks/cinder.yml
-  vars:
-    cinder_hosts: "cinder_api"
-    cinder_serial: "{{ cinder_api_serial | default(['1', '100%']) }}"
-
-
-
 - name: Install cinder scheduler services
   include: common-playbooks/cinder.yml
   vars:
@@ -89,6 +81,14 @@
 
 
 
+- name: Install cinder API services
+  include: common-playbooks/cinder.yml
+  vars:
+    cinder_hosts: "cinder_api"
+    cinder_serial: "{{ cinder_api_serial | default(['1', '100%']) }}"
+
+
+
 # These facts are set against the deployment host to ensure that
 # they are fast to access. This is done in preference to setting
 # them against each target as the hostvars extraction will take
@@ -148,13 +148,13 @@
     - name: Execute cinder service reload
       include: common-tasks/restart-service.yml
       vars:
-        service_name: "{{ item.name }}"
-        service_action: "{{ item.action }}"
+        service_name: "{{ item }}"
+        service_action: "reloaded"
         service_fact: "cinder"
       with_items:
-        - { name: "cinder-backup", action: "restarted" }
-        - { name: "cinder-volume", action: "restarted" }
-        - { name: "cinder-scheduler", action: "restarted" }
+        - "cinder-scheduler"
+        - "cinder-backup"
+        - "cinder-volume"
       when:
         - "cinder_all_software_updated | bool"
         - "ansible_local['openstack_ansible']['cinder']['need_service_restart'] | bool"