Merge "Add a job that *only* deploys updated containers"

ansible/roles/aodh/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check aodh containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ aodh_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/aodh/tasks/config.yml

@@ -90,19 +90,5 @@
   notify:
     - "Restart aodh-api container"
 
-- name: Check aodh containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ aodh_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/aodh/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/barbican/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check barbican containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ barbican_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/barbican/tasks/config.yml

@@ -134,19 +134,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check barbican containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ barbican_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/barbican/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/blazar/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check blazar containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ blazar_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/blazar/tasks/config.yml

@@ -76,19 +76,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check blazar containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ blazar_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/blazar/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/ceilometer/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check ceilometer containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged | default(False) }}"
+    volumes: "{{ item.value.volumes | reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ ceilometer_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/ceilometer/tasks/config.yml

@@ -329,21 +329,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-# check whether the containers parameter is changed. If yes, trigger the handler.
-- name: Check ceilometer containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged | default(False) }}"
-    volumes: "{{ item.value.volumes | reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ ceilometer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/ceilometer/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/chrony/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check chrony container
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ chrony_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/chrony/tasks/config.yml

@@ -52,20 +52,5 @@
   notify:
     - Restart chrony container
 
-- name: Check chrony container
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ chrony_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/chrony/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/cinder/tasks/check-containers.yml

@@ -0,0 +1,18 @@
+---
+- name: Check cinder containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
+    dimensions: "{{ item.value.dimensions }}"
+    privileged: "{{ item.value.privileged | default(False) }}"
+    ipc_mode: "{{ item.value.ipc_mode | default('') }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ cinder_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/cinder/tasks/config.yml

@@ -130,21 +130,5 @@
   notify:
     - Restart cinder-volume container
 
-- name: Check cinder containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ item.value.dimensions }}"
-    privileged: "{{ item.value.privileged | default(False) }}"
-    ipc_mode: "{{ item.value.ipc_mode | default('') }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cinder_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/cinder/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/cloudkitty/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check cloudkitty containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ cloudkitty_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/cloudkitty/tasks/config.yml

@@ -112,19 +112,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check cloudkitty containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cloudkitty_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/cloudkitty/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/collectd/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check collectd containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged | default(False) }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ collectd_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/collectd/tasks/config.yml

@@ -57,20 +57,5 @@
   notify:
     - Restart collectd container
 
-- name: Check collectd containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged | default(False) }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ collectd_services }}"
-  notify:
-    - Restart collectd container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/collectd/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/common/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check common containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+    privileged: "{{ item.value.privileged | default(False) }}"
+    environment: "{{ item.value.environment }}"
+  when:
+    - item.value.enabled | bool
+  with_dict: "{{ common_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/common/tasks/config.yml

@@ -353,20 +353,5 @@
     - item.key != "kolla-toolbox"
   with_dict: "{{ common_services }}"
 
-- name: Check common containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-    privileged: "{{ item.value.privileged | default(False) }}"
-    environment: "{{ item.value.environment }}"
-  when:
-    - kolla_action != "config"
-    - item.value.enabled | bool
-  with_dict: "{{ common_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/common/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/congress/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check congress containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ congress_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/congress/tasks/config.yml

@@ -76,19 +76,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Check congress containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ congress_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/congress/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/cyborg/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check cyborg containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ cyborg_services }}"
+  notify:
+    - Restart {{ item.key }} container

ansible/roles/cyborg/tasks/config.yml

@@ -99,19 +99,5 @@
   notify:
     - Restart cyborg-api container
 
-- name: Check cyborg containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cyborg_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/cyborg/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/designate/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check designate containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ designate_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/designate/tasks/config.yml

@@ -146,19 +146,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check designate containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ designate_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/designate/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/elasticsearch/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check elasticsearch containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+    environment: "{{ item.value.environment }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ elasticsearch_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/elasticsearch/tasks/config.yml

@@ -47,20 +47,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check elasticsearch containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-    environment: "{{ item.value.environment }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ elasticsearch_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/elasticsearch/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/etcd/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check etcd containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+    environment: "{{ item.value.environment }}"
+  when:
+    - item.value.enabled | bool
+    - inventory_hostname in groups[item.value.group]
+  with_dict: "{{ etcd_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/etcd/tasks/config.yml

@@ -25,20 +25,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check etcd containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-    environment: "{{ item.value.environment }}"
-  when:
-    - kolla_action != "config"
-    - item.value.enabled | bool
-    - inventory_hostname in groups[item.value.group]
-  with_dict: "{{ etcd_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/etcd/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/freezer/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check freezer containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ freezer_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/freezer/tasks/config.yml

@@ -90,19 +90,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Check freezer containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/freezer/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/glance/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check glance containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    environment: "{{ item.value.environment | default(omit) }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - item.value.host_in_groups | bool
+    - item.value.enabled | bool
+  with_dict: "{{ glance_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/glance/tasks/config.yml

@@ -124,20 +124,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check glance containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    environment: "{{ item.value.environment | default(omit) }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - item.value.host_in_groups | bool
-    - item.value.enabled | bool
-  with_dict: "{{ glance_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/glance/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/gnocchi/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check gnocchi containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ gnocchi_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/gnocchi/tasks/config.yml

@@ -102,19 +102,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check gnocchi containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ gnocchi_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/gnocchi/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/grafana/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check grafana containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ grafana_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/grafana/tasks/config.yml

@@ -95,19 +95,5 @@
   notify:
     - Restart grafana container
 
-- name: Check grafana containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ grafana_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/grafana/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/haproxy/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Deploy haproxy containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+    privileged: "{{ item.value.privileged | default(False) }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ haproxy_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/haproxy/tasks/config.yml

@@ -144,20 +144,5 @@
   notify:
     - Restart haproxy container
 
-- name: Check haproxy containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-    privileged: "{{ item.value.privileged | default(False) }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ haproxy_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/haproxy/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/heat/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check heat containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ heat_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/heat/tasks/config.yml

@@ -76,19 +76,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check heat containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ heat_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/heat/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/horizon/tasks/check-containers.yml

@@ -0,0 +1,19 @@
+---
+- name: Deploy horizon container
+  vars:
+    horizon: "{{ horizon_services['horizon'] }}"
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ horizon.container_name }}"
+    image: "{{ horizon.image }}"
+    environment: "{{ horizon.environment }}"
+    volumes: "{{ horizon.volumes }}"
+    dimensions: "{{ horizon.dimensions }}"
+  when:
+    - inventory_hostname in groups[horizon.group]
+    - horizon.enabled | bool
+  with_dict: "{{ horizon_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/horizon/tasks/config.yml

@@ -131,21 +131,5 @@
   notify:
     - Restart horizon container
 
-- name: Check horizon container
-  vars:
-    horizon: "{{ horizon_services['horizon'] }}"
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ horizon.container_name }}"
-    image: "{{ horizon.image }}"
-    environment: "{{ horizon.environment }}"
-    volumes: "{{ horizon.volumes }}"
-    dimensions: "{{ horizon.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[horizon.group]
-    - horizon.enabled | bool
-  notify:
-    - Restart horizon container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/horizon/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/influxdb/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check influxdb containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ influxdb_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/influxdb/tasks/config.yml

@@ -43,19 +43,5 @@
   notify:
     - Restart influxdb container
 
-- name: Check influxdb containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ influxdb_services }}"
-  notify:
-    - Restart influxdb container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/influxdb/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/ironic/tasks/check-containers.yml

@@ -0,0 +1,18 @@
+---
+- name: Check ironic containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged|default(False) }}"
+    cap_add: "{{ item.value.cap_add|default([]) }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ ironic_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/ironic/tasks/config.yml

@@ -245,21 +245,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Check ironic containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged|default(False) }}"
-    cap_add: "{{ item.value.cap_add|default([]) }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ ironic_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/ironic/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/iscsi/tasks/check-containers.yml

@@ -0,0 +1,18 @@
+---
+- name: Check iscsi containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    ipc_mode: "{{ item.value.ipc_mode }}"
+    privileged: "{{ item.value.privileged|default(False) }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ iscsi_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/iscsi/tasks/config.yml

@@ -35,21 +35,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Check iscsi containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    ipc_mode: "{{ item.value.ipc_mode }}"
-    privileged: "{{ item.value.privileged|default(False) }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ iscsi_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/iscsi/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/kafka/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check kafka containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    environment: "{{ item.value.environment }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ kafka_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/kafka/tasks/config.yml

@@ -41,20 +41,5 @@
   notify:
     - Restart kafka container
 
-- name: Check kafka containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    environment: "{{ item.value.environment }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ kafka_services }}"
-  notify:
-    - Restart kafka container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/kafka/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/karbor/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check karbor containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ karbor_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/karbor/tasks/config.yml

@@ -79,19 +79,5 @@
   notify:
     - Restart karbor-protection container
 
-- name: Check karbor containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ karbor_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/karbor/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/keystone/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check keystone containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ keystone_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/keystone/tasks/config.yml

@@ -216,19 +216,5 @@
   notify:
     - Restart keystone-ssh container
 
-- name: Check keystone containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ keystone_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/keystone/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/kibana/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check kibana containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ kibana_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/kibana/tasks/config.yml

@@ -43,19 +43,5 @@
   notify:
     - Restart kibana container
 
-- name: Check kibana containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ kibana_services }}"
-  notify:
-    - Restart kibana container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/kibana/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/kuryr/tasks/check-containers.yml

@@ -0,0 +1,18 @@
+---
+- name: Check kuryr containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged|default(False) }}"
+    cap_add: "{{ item.value.cap_add }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ kuryr_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/kuryr/tasks/config.yml

@@ -92,21 +92,5 @@
   notify:
     - Restart kuryr container
 
-- name: Check kuryr containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged|default(False) }}"
-    cap_add: "{{ item.value.cap_add }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ kuryr_services }}"
-  notify:
-    - Restart kuryr container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/kuryr/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/magnum/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check magnum containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+    environment: "{{ item.value.environment }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ magnum_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/magnum/tasks/config.yml

@@ -76,20 +76,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- name: Check magnum containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-    environment: "{{ item.value.environment }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ magnum_services }}"
-  notify:
-    - Restart {{ item.key }} container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/magnum/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/manila/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check manila containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    privileged: "{{ item.value.privileged|default(False) }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ manila_services }}"
+  notify:
+    - "Restart {{ item.key }} container"

ansible/roles/manila/tasks/config.yml

@@ -114,20 +114,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Check manila containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    privileged: "{{ item.value.privileged|default(False) }}"
-    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ manila_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/manila/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/mariadb/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check mariadb containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes }}"
+    dimensions: "{{ item.value.dimensions }}"
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ mariadb_services }}"
+  notify:
+    - restart mariadb

ansible/roles/mariadb/tasks/config.yml

@@ -85,19 +85,5 @@
   notify:
     - restart mariadb
 
-- name: Check mariadb containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ mariadb_services }}"
-  notify:
-    - restart mariadb
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/mariadb/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/memcached/tasks/check-containers.yml

@@ -0,0 +1,16 @@
+---
+- name: Check memcached container
+  vars:
+    service: "{{ memcached_services.memcached }}"
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ service.container_name }}"
+    image: "{{ service.image }}"
+    volumes: "{{ service.volumes }}"
+    dimensions: "{{ service.dimensions }}"
+  when:
+    - inventory_hostname in groups[service.group]
+    - service.enabled | bool
+  notify: Restart memcached container

ansible/roles/memcached/tasks/config.yml

@@ -25,19 +25,5 @@
     - service.enabled | bool
   notify: Restart memcached container
 
-- name: Check memcached container
-  vars:
-    service: "{{ memcached_services.memcached }}"
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"
-    - inventory_hostname in groups[service.group]
-    - service.enabled | bool
-  notify: Restart memcached container
+- include_tasks: check-containers.yml
+  when: kolla_action != "config"

ansible/roles/memcached/tasks/deploy-containers.yml

@@ -0,0 +1,2 @@
+---
+- import_tasks: check-containers.yml

ansible/roles/mistral/tasks/check-containers.yml

@@ -0,0 +1,17 @@
+---
+- name: Check mistral containers
+  become: true
+  kolla_docker:
+    action: "compare_container"
+    common_options: "{{ docker_common_options }}"
+    name: "{{ item.value.container_name }}"
+    image: "{{ item.value.image }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+    dimensions: "{{ item.value.dimensions }}"
+
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ mistral_services }}"
+  notify:
+    - "Restart {{ item.key }} container"