Merge "Allow glance role to pull images"

ansible/roles/glance/tasks/deploy.yml

+---
+- include: ceph.yml
+  when:
+    - enable_ceph | bool
+    - inventory_hostname in groups['ceph-mon'] or
+        inventory_hostname in groups['glance-api'] or
+        inventory_hostname in groups['glance-registry']
+
+- include: register.yml
+  when: inventory_hostname in groups['glance-api']
+
+- include: config.yml
+  when: inventory_hostname in groups['glance-api'] or
+        inventory_hostname in groups['glance-registry']
+
+- include: bootstrap.yml
+  when: inventory_hostname in groups['glance-api']
+
+- include: start.yml
+  when: inventory_hostname in groups['glance-api'] or
+        inventory_hostname in groups['glance-registry']
+
+- include: check.yml
+  when: inventory_hostname in groups['glance-api'] or
+        inventory_hostname in groups['glance-registry']

ansible/roles/glance/tasks/main.yml

 ---
-- include: ceph.yml
-  when:
-    - enable_ceph | bool
-    - inventory_hostname in groups['ceph-mon'] or
-        inventory_hostname in groups['glance-api'] or
-        inventory_hostname in groups['glance-registry']
-
-- include: register.yml
-  when: inventory_hostname in groups['glance-api']
-
-- include: config.yml
-  when: inventory_hostname in groups['glance-api'] or
-        inventory_hostname in groups['glance-registry']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['glance-api']
-
-- include: start.yml
-  when: inventory_hostname in groups['glance-api'] or
-        inventory_hostname in groups['glance-registry']
-
-- include: check.yml
-  when: inventory_hostname in groups['glance-api'] or
-        inventory_hostname in groups['glance-registry']
+- include: "{{ action }}.yml"

ansible/roles/glance/tasks/pull.yml

+---
+- name: Pulling glance-api image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ glance_api_image_full }}"
+  when: inventory_hostname in groups['glance-api']
+
+- name: Pulling glance-registry image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ glance_registry_image_full }}"
+  when: inventory_hostname in groups['glance-registry']