Merge "Refactor and optimise image pulling"

ansible/roles/aodh/tasks/pull.yml

 ---
-- name: Pulling aodh images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ aodh_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/barbican/tasks/pull.yml

 ---
-- name: Pulling barbican images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ barbican_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/blazar/tasks/pull.yml

 ---
-- name: Pulling blazar images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ blazar_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/ceilometer/tasks/pull.yml

 ---
-- name: Pulling ceilometer images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ ceilometer_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/chrony/tasks/pull.yml

 ---
-- name: Pulling chrony images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ chrony_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/cinder/tasks/pull.yml

 ---
-- name: Pulling cinder images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cinder_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/cloudkitty/tasks/pull.yml

 ---
-- name: Pulling cloudkitty images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cloudkitty_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/collectd/tasks/pull.yml

 ---
-- name: Pulling collectd image
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ collectd_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/common/tasks/pull.yml

 ---
-- name: Pulling common images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value | service_enabled_and_mapped_to_host
-  with_dict: "{{ common_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/cyborg/tasks/pull.yml

 ---
-- name: Pulling cyborg images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ cyborg_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/designate/tasks/pull.yml

 ---
-- name: Pulling designate images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ designate_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/elasticsearch/tasks/pull.yml

 ---
-- name: Pulling elasticsearch images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ elasticsearch_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/etcd/tasks/pull.yml

 ---
-- name: Pulling etcd image
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.enabled | bool
-    - inventory_hostname in groups[item.value.group]
-  with_dict: "{{ etcd_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/freezer/tasks/pull.yml

 ---
-- name: Pulling freezer images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/glance/tasks/pull.yml

 ---
-- name: Pulling glance images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.host_in_groups | bool
-    - item.value.enabled | bool
-  with_dict: "{{ glance_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/gnocchi/tasks/pull.yml

 ---
-- name: Pulling gnocchi images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ gnocchi_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/grafana/tasks/pull.yml

 ---
-- name: Pulling grafana image
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ grafana_image_full }}"
-  when: inventory_hostname in groups['grafana']
+- import_role:
+    role: service-images-pull

ansible/roles/hacluster/tasks/pull.yml

 ---
-- name: Pulling hacluster images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ hacluster_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/haproxy/tasks/pull.yml

 ---
-- name: Pulling haproxy images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ haproxy_services }}"
+- import_role:
+    role: service-images-pull

ansible/roles/heat/tasks/pull.yml

 ---
-- name: Pulling heat images
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ heat_services }}"
+- import_role:
+    role: service-images-pull