Merge "Start nova-conductor earlier"

ansible/roles/nova/handlers/main.yml

@@ -94,14 +94,14 @@
       or policy_json.changed | bool
       or nova_api_container.changed | bool
 
-- name: Restart nova-consoleauth container
+- name: Restart nova-scheduler container
   vars:
-    service_name: "nova-consoleauth"
+    service_name: "nova-scheduler"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_consoleauth_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_scheduler_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -116,16 +116,16 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_consoleauth_container.changed | bool
+      or nova_scheduler_container.changed | bool
 
-- name: Restart nova-novncproxy container
+- name: Restart nova-conductor container
   vars:
-    service_name: "nova-novncproxy"
+    service_name: "nova-conductor"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_novncproxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_conductor_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -140,16 +140,17 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_novncproxy_container.changed | bool
+      or nova_conductor_container.changed | bool
 
-- name: Restart nova-spicehtml5proxy container
+
+- name: Restart nova-consoleauth container
   vars:
-    service_name: "nova-spicehtml5proxy"
+    service_name: "nova-consoleauth"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_spicehtml5proxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_consoleauth_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -164,16 +165,16 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_spicehtml5proxy_container.changed | bool
+      or nova_consoleauth_container.changed | bool
 
-- name: Restart nova-serialproxy container
+- name: Restart nova-novncproxy container
   vars:
-    service_name: "nova-serialproxy"
+    service_name: "nova-novncproxy"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_serialproxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_novncproxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -188,16 +189,16 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_serialproxy_container.changed | bool
+      or nova_novncproxy_container.changed | bool
 
-- name: Restart nova-scheduler container
+- name: Restart nova-spicehtml5proxy container
   vars:
-    service_name: "nova-scheduler"
+    service_name: "nova-spicehtml5proxy"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_scheduler_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_spicehtml5proxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -212,16 +213,16 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_scheduler_container.changed | bool
+      or nova_spicehtml5proxy_container.changed | bool
 
-- name: Restart nova-conductor container
+- name: Restart nova-serialproxy container
   vars:
-    service_name: "nova-conductor"
+    service_name: "nova-serialproxy"
     service: "{{ nova_services[service_name] }}"
     config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
     nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
     policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    nova_conductor_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    nova_serialproxy_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -236,7 +237,7 @@
     - config_json.changed | bool
       or nova_conf.changed | bool
       or policy_json.changed | bool
-      or nova_conductor_container.changed | bool
+      or nova_serialproxy_container.changed | bool
 
 - name: Restart nova-compute container
   vars: