Merge "Fix Masakari role missing deploy-containers"

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

@@ -0,0 +1,17 @@
+---
+- name: Check masakari 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: "{{ masakari_services }}"
+  notify:
+    - Restart {{ item.key }} container

ansible/roles/masakari/tasks/config.yml

@@ -132,20 +132,5 @@
   notify:
     - Restart masakari-api container
 
-- name: Check masakari containers
+- import_tasks: check-containers.yml
-  become: true
+  when: kolla_action != "config"
-  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: "{{ masakari_services }}"
-  notify:
-    - Restart {{ item.key }} container

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

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

releasenotes/notes/bug-1889611-f08c228fca884bf2.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes ``deploy-containers`` action missing for the Masakari role.
+    `LP#1889611 <https://launchpad.net/bugs/1889611>`__