Merge "Fix ansible warning"

ansible/roles/aodh/handlers/main.yml

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

ansible/roles/aodh/tasks/config.yml

@@ -112,7 +112,7 @@
     volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   register: check_aodh_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ aodh_services }}"

ansible/roles/aodh/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/barbican/handlers/main.yml

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

ansible/roles/barbican/tasks/config.yml

@@ -131,7 +131,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_barbican_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ barbican_services }}"

ansible/roles/barbican/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/baremetal/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/bifrost/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/ceilometer/handlers/main.yml

@@ -16,7 +16,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -43,7 +43,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -69,7 +69,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/ceilometer/tasks/config.yml

@@ -171,7 +171,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_ceilometer_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ ceilometer_services }}"

ansible/roles/ceilometer/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/ceph/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/chrony/handlers/main.yml

@@ -11,6 +11,6 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool

ansible/roles/chrony/tasks/config.yml

@@ -43,7 +43,7 @@
     privileged: "{{ item.value.privileged }}"
     volumes: "{{ item.value.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ chrony_services }}"

ansible/roles/chrony/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/cinder/handlers/main.yml

@@ -14,7 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes | reject('equalto', '') | list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -38,7 +38,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes | reject('equalto', '') | list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -63,7 +63,7 @@
     ipc_mode: "{{ service.ipc_mode | default('') }}"
     volumes: "{{ service.volumes | reject('equalto', '') | list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -87,7 +87,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes | reject('equalto', '') | list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/cinder/tasks/config.yml

@@ -130,7 +130,7 @@
     ipc_mode: "{{ item.value.ipc_mode | default('') }}"
   register: check_cinder_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ cinder_services }}"

ansible/roles/cinder/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/cloudkitty/handlers/main.yml

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

ansible/roles/cloudkitty/tasks/config.yml

@@ -106,7 +106,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_cloudkitty_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ cloudkitty_services }}"

ansible/roles/cloudkitty/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/collectd/handlers/main.yml

@@ -13,7 +13,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/collectd/tasks/config.yml

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

ansible/roles/collectd/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/common/handlers/main.yml

@@ -13,7 +13,7 @@
     volumes: "{{ service.volumes }}"
     environment: "{{ service.environment }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - config_json.changed | bool
       or fluentd_input.changed | bool
@@ -40,7 +40,7 @@
     volumes: "{{ service.volumes }}"
     environment: "{{ service.environment }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - config_json.changed | bool
       or kolla_toolbox_container.changed | bool
@@ -65,7 +65,7 @@
     volumes: "{{ service.volumes }}"
     environment: "{{ service.environment }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - config_json.changed | bool
       or cron_confs.changed | bool

ansible/roles/common/tasks/config.yml

@@ -256,7 +256,7 @@
     environment: "{{ item.value.environment }}"
   register: check_common_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - item.value.enabled | bool
   with_dict: "{{ common_services }}"
   notify:

ansible/roles/common/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"
   tags: common
   when: not common_run
 

ansible/roles/congress/handlers/main.yml

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

ansible/roles/congress/tasks/config.yml

@@ -86,7 +86,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_congress_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ congress_services }}"

ansible/roles/congress/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/designate/handlers/main.yml

@@ -12,7 +12,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,7 +36,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -59,7 +59,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -82,7 +82,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -105,7 +105,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -128,7 +128,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -153,7 +153,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/designate/tasks/config.yml

@@ -185,7 +185,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_designate_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ designate_services }}"

ansible/roles/designate/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/elasticsearch/handlers/main.yml

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

ansible/roles/elasticsearch/tasks/config.yml

@@ -59,7 +59,7 @@
     environment: "{{ item.value.environment }}"
   register: check_elasticsearch_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ elasticsearch_services }}"

ansible/roles/elasticsearch/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/etcd/handlers/main.yml

@@ -13,7 +13,7 @@
     environment: "{{ service.environment }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json.changed | bool

ansible/roles/etcd/tasks/config.yml

@@ -36,7 +36,7 @@
     environment: "{{ item.value.environment }}"
   register: check_etcd_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - item.value.enabled | bool
     - item.value.host_in_groups | bool
   with_dict: "{{ etcd_services }}"

ansible/roles/etcd/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/freezer/handlers/main.yml

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

ansible/roles/freezer/tasks/config.yml

@@ -103,7 +103,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_freezer_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ freezer_services }}"

ansible/roles/freezer/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/glance/handlers/main.yml

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

ansible/roles/glance/tasks/config.yml

@@ -120,7 +120,7 @@
     volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   register: check_glance_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ glance_services }}"

ansible/roles/glance/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/gnocchi/handlers/main.yml

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

ansible/roles/gnocchi/tasks/config.yml

@@ -109,7 +109,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_gnocchi_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ gnocchi_services }}"

ansible/roles/gnocchi/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/grafana/handlers/main.yml

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

ansible/roles/grafana/tasks/config.yml

@@ -109,7 +109,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_grafana_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ grafana_services }}"

ansible/roles/grafana/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/haproxy/handlers/main.yml

@@ -13,7 +13,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -37,7 +37,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -51,7 +51,7 @@
   register: status
   changed_when: status.stdout.find('changed') != -1
   when:
-    - action != "config"
+    - kolla_action != "config"
     - haproxy_config_jsons.changed | bool
       or haproxy_cfg.changed | bool
       or haproxy_pem.changed | bool

ansible/roles/haproxy/tasks/config.yml

@@ -103,7 +103,7 @@
     privileged: "{{ item.value.privileged | default(False) }}"
   register: check_haproxy_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ haproxy_services }}"

ansible/roles/haproxy/tasks/main.yml

@@ -1,3 +1,3 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"
   when: inventory_hostname in groups['haproxy']

ansible/roles/heat/handlers/main.yml

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

ansible/roles/heat/tasks/config.yml

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

ansible/roles/heat/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/horizon/handlers/main.yml

@@ -11,7 +11,7 @@
     environment: "{{ service.environment }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - horizon_config_json | changed

ansible/roles/horizon/tasks/config.yml

@@ -126,7 +126,7 @@
     volumes: "{{ horizon.volumes }}"
   register: check_horizon_container
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[horizon.group]
     - horizon.enabled | bool
   notify:

ansible/roles/horizon/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/influxdb/handlers/main.yml

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

ansible/roles/influxdb/tasks/config.yml

@@ -54,7 +54,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_influxdb_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ influxdb_services }}"

ansible/roles/influxdb/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/ironic/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/iscsi/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/karbor/handlers/main.yml

@@ -13,7 +13,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -34,7 +34,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -56,7 +56,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/karbor/tasks/config.yml

@@ -78,7 +78,7 @@
   become: true
   register: check_karbor_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ karbor_services }}"

ansible/roles/karbor/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/keystone/handlers/main.yml

@@ -21,7 +21,7 @@
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   run_once: True
   when:
-    - action == "upgrade"
+    - kolla_action == "upgrade"
     - service.enabled | bool
     - inventory_hostname == groups[service.group][0]
 
@@ -40,7 +40,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -64,7 +64,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -86,7 +86,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -114,6 +114,6 @@
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   run_once: True
   when:
-    - action == "upgrade"
+    - kolla_action == "upgrade"
     - service.enabled | bool
     - inventory_hostname == groups[service.group][-1]

ansible/roles/keystone/tasks/config.yml

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

ansible/roles/keystone/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/kibana/handlers/main.yml

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

ansible/roles/kibana/tasks/config.yml

@@ -49,7 +49,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_kibana_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ kibana_services }}"

ansible/roles/kibana/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/kuryr/handlers/main.yml

@@ -16,7 +16,7 @@
     cap_add: "{{ service.cap_add }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/kuryr/tasks/config.yml

@@ -107,7 +107,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_kuryr_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ kuryr_services }}"

ansible/roles/kuryr/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/magnum/handlers/main.yml

@@ -15,7 +15,7 @@
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
     environment: "{{ service.environment }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -39,7 +39,7 @@
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
     environment: "{{ service.environment }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/magnum/tasks/config.yml

@@ -92,7 +92,7 @@
     environment: "{{ item.value.environment }}"
   register: check_magnum_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ magnum_services }}"

ansible/roles/magnum/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/manila/handlers/main.yml

@@ -14,7 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -38,7 +38,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -61,7 +61,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -84,7 +84,7 @@
     privileged: "{{ service.privileged | default(False) }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/manila/tasks/config.yml

@@ -115,7 +115,7 @@
     volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   register: check_manila_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ manila_services }}"

ansible/roles/manila/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/mariadb/handlers/main.yml

@@ -53,7 +53,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname != master_host
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
@@ -79,7 +79,7 @@
   retries: 10
   delay: 6
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname != master_host
 
 - name: restart master mariadb
@@ -94,7 +94,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname == master_host
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
@@ -120,5 +120,5 @@
   retries: 10
   delay: 6
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname == master_host

ansible/roles/mariadb/tasks/config.yml

@@ -74,7 +74,7 @@
   become: true
   register: check_mariadb_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ mariadb_services }}"

ansible/roles/mariadb/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/memcached/handlers/main.yml

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

ansible/roles/memcached/tasks/config.yml

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

ansible/roles/memcached/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/mistral/handlers/main.yml

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

ansible/roles/mistral/tasks/config.yml

@@ -86,7 +86,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_mistral_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ mistral_services }}"

ansible/roles/mistral/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/mongodb/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/multipathd/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/murano/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"

ansible/roles/murano/tasks/start.yml

@@ -64,7 +64,7 @@
   run_once: True
   delegate_to: "{{ groups['murano-api'][0] }}"
   when:
-    - status.stdout.find("io.murano") == -1 or action == "upgrade"
+    - status.stdout.find("io.murano") == -1 or kolla_action == "upgrade"
 
 - name: Importing Murano applications library package
   command: >
@@ -78,4 +78,4 @@
   run_once: True
   delegate_to: "{{ groups['murano-api'][0] }}"
   when:
-    - status.stdout.find("io.murano.applications") == -1 or action == "upgrade"
+    - status.stdout.find("io.murano.applications") == -1 or kolla_action == "upgrade"

ansible/roles/neutron/handlers/main.yml

@@ -18,7 +18,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -47,7 +47,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -73,7 +73,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -100,7 +100,7 @@
     privileged: "{{ service.privileged | default(False) }}"
   with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - enable_nova_fake | bool
     - neutron_plugin_agent == "openvswitch"
     - inventory_hostname in groups["compute"]
@@ -127,7 +127,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -152,7 +152,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -182,7 +182,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -211,7 +211,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -237,7 +237,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -262,7 +262,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed
@@ -287,7 +287,7 @@
     volumes: "{{ service.volumes }}"
     privileged: "{{ service.privileged | default(False) }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - service.enabled | bool
     - service.host_in_groups | bool
     - config_json | changed

ansible/roles/neutron/tasks/config-neutron-fake.yml

@@ -69,7 +69,7 @@
     volumes: "{{ neutron_openvswitch_agent.volumes }}"
   register: check_fake_neutron_openvswitch_agent
   when:
-    - action != "config"
+    - kolla_action != "config"
     - enable_nova_fake | bool
     - neutron_plugin_agent == "openvswitch"
     - inventory_hostname in groups["compute"]

ansible/roles/neutron/tasks/config.yml

@@ -423,7 +423,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_neutron_containers
   when:
-    - action != "config"
+    - kolla_action != "config"
     - item.value.enabled | bool
     - item.value.host_in_groups | bool
   with_dict: "{{ neutron_services }}"

ansible/roles/neutron/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ action }}.yml"
+- include: "{{ kolla_action }}.yml"