Merge "Fix missed kolla_action and kolla_serial"

ansible/kolla-host.yml

@@ -6,7 +6,7 @@
 # Ansible gathering facts twice.
 - name: Gather facts for all hosts
   hosts: all
-  serial: '{{ serial|default("0") }}'
+  serial: '{{ kolla_serial|default("0") }}'
   gather_facts: false
   tasks:
     - setup:
@@ -21,7 +21,7 @@
 # which can be very inefficient.
 - name: Gather facts for all hosts (if using --limit)
   hosts: all
-  serial: '{{ serial|default("0") }}'
+  serial: '{{ kolla_serial|default("0") }}'
   gather_facts: false
   tasks:
     - setup:

ansible/roles/blazar/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

ansible/roles/blazar/tasks/config.yml

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

ansible/roles/blazar/tasks/main.yml

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

ansible/roles/ironic/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 @@
     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
@@ -61,7 +61,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
@@ -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 @@
     volumes: "{{ service.volumes }}"
     cap_add: "{{ service.cap_add }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool

ansible/roles/ironic/tasks/config.yml

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

ansible/roles/kafka/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/kafka/tasks/config.yml

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

ansible/roles/kafka/tasks/main.yml

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

ansible/roles/mongodb/handlers/main.yml

@@ -14,7 +14,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/mongodb/tasks/config.yml

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

ansible/roles/neutron/handlers/main.yml

@@ -312,7 +312,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/prometheus/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
@@ -33,7 +33,7 @@
     pid_mode: "{{ service.pid_mode | default(emit) }}"
     volumes: "{{ service.volumes }}"
   when:
-    - action != "config"
+    - kolla_action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -52,7 +52,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
@@ -72,7 +72,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/prometheus/tasks/config.yml

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

ansible/roles/prometheus/tasks/main.yml

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

ansible/roles/zookeeper/handlers/main.yml

@@ -15,7 +15,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/zookeeper/tasks/config.yml

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

ansible/roles/zookeeper/tasks/main.yml

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