Fix fernet deploy on gate

keystone-ssh is required by keystone-fernet. So start keystone-ssh
container before keystone-fernet.

Closes-Bug: #1751224
Change-Id: Ie1c8ae185549acc3dd87a2c5f0356443ea7924a5

ansible/roles/keystone/handlers/main.yml

@@ -51,14 +51,12 @@
       or keystone_paste_ini.changed | bool
       or keystone_container.changed | bool
 
-- name: Restart keystone-fernet container
+- name: Restart keystone-ssh container
   vars:
-    service_name: "keystone-fernet"
+    service_name: "keystone-ssh"
     service: "{{ keystone_services[service_name] }}"
     config_json: "{{ keystone_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    keystone_conf: "{{ keystone_confs.results|selectattr('item.key', 'equalto', service_name)|first  }}"
-    policy_overwriting: "{{ keystone_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    keystone_fernet_container: "{{ check_keystone_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    keystone_ssh_container: "{{ check_keystone_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -70,17 +68,17 @@
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
-      or keystone_conf.changed | bool
-      or policy_overwriting.changed | bool
-      or keystone_fernet_confs.changed | bool
-      or keystone_fernet_container.changed | bool
+      or keystone_ssh_confs.changed | bool
+      or keystone_ssh_container.changed | bool
 
-- name: Restart keystone-ssh container
+- name: Restart keystone-fernet container
   vars:
-    service_name: "keystone-ssh"
+    service_name: "keystone-fernet"
     service: "{{ keystone_services[service_name] }}"
     config_json: "{{ keystone_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
-    keystone_ssh_container: "{{ check_keystone_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    keystone_conf: "{{ keystone_confs.results|selectattr('item.key', 'equalto', service_name)|first  }}"
+    policy_overwriting: "{{ keystone_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
+    keystone_fernet_container: "{{ check_keystone_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
   kolla_docker:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
@@ -92,8 +90,10 @@
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
-      or keystone_ssh_confs.changed | bool
-      or keystone_ssh_container.changed | bool
+      or keystone_conf.changed | bool
+      or policy_overwriting.changed | bool
+      or keystone_fernet_confs.changed | bool
+      or keystone_fernet_container.changed | bool
 
 - name: Finish keystone database upgrade
   vars: