Merge "Allow heat role to pull images"

ansible/roles/heat/tasks/deploy.yml

+---
+- include: register.yml
+  when: inventory_hostname in groups['heat-api']
+
+- include: config.yml
+  when: inventory_hostname in groups['heat-api'] or
+        inventory_hostname in groups['heat-api-cfn'] or
+        inventory_hostname in groups['heat-engine']
+
+- include: bootstrap.yml
+  when: inventory_hostname in groups['heat-api']
+
+- include: start.yml
+  when: inventory_hostname in groups['heat-api'] or
+        inventory_hostname in groups['heat-api-cfn'] or
+        inventory_hostname in groups['heat-engine']

ansible/roles/heat/tasks/main.yml

 ---
-- include: register.yml
-  when: inventory_hostname in groups['heat-api']
-
-- include: config.yml
-  when: inventory_hostname in groups['heat-api'] or
-        inventory_hostname in groups['heat-api-cfn'] or
-        inventory_hostname in groups['heat-engine']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['heat-api']
-
-- include: start.yml
-  when: inventory_hostname in groups['heat-api'] or
-        inventory_hostname in groups['heat-api-cfn'] or
-        inventory_hostname in groups['heat-engine']
+- include: "{{ action }}.yml"

ansible/roles/heat/tasks/pull.yml

+---
+- name: Pulling heat-api image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_api_image_full }}"
+  when: inventory_hostname in groups['heat-api']
+
+- name: Pulling heat-api-cfn image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_api_cfn_image_full }}"
+  when: inventory_hostname in groups['heat-api-cfn']
+
+- name: Pulling heat-engine image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_engine_image_full }}"
+  when: inventory_hostname in groups['heat-engine']