Fixed config generation to check correct actions

A config generation check was added to a few services but the action
name checked was "genconfig" where the kolla-ansible genconfig command
actually uses the action name "config".

Stop run the handlers when action is "config".

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Partially-implements: blueprint better-reconfigure
Change-Id: I9d3be2f674087f340108b176c8e8e2209ffa8806

ansible/roles/glance/handlers/main.yml

@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -37,6 +38,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/glance/tasks/config.yml

@@ -68,9 +68,9 @@
     volumes: "{{ item.value.volumes }}"
   register: check_glance_containers
   when:
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
-    - action != "genconfig"
   with_dict: "{{ glance_services }}"
   notify:
     - Restart glance-api container

ansible/roles/heat/handlers/main.yml

@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -58,6 +60,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/heat/tasks/config.yml

@@ -78,6 +78,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_heat_containers
   when:
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ heat_services }}"

ansible/roles/keystone/handlers/main.yml

@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -39,6 +40,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -60,6 +62,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/keystone/tasks/config.yml

@@ -179,7 +179,7 @@
     image: "{{ item.value.image }}"
     volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   register: check_keystone_containers

ansible/roles/memcached/handlers/main.yml

@@ -8,6 +8,7 @@
     name: "{{ service.container_name }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - memcached_config_json.changed | bool

ansible/roles/memcached/tasks/config.yml

@@ -29,5 +29,5 @@
   when:
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
-    - action != "genconfig"
+    - action != "config"
   notify: Restart memcached container

ansible/roles/searchlight/handlers/main.yml

@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/searchlight/tasks/config.yml

@@ -63,7 +63,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_searchlight_containers
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ searchlight_services }}"

ansible/roles/senlin/handlers/main.yml

@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/senlin/tasks/config.yml

@@ -69,7 +69,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_senlin_containers
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ senlin_services }}"