Refactor and optimise image pulling

We get a nice optimisation by using a filtered loop instead
of task skipping per service with 'when'.

Partially-Implements: blueprint performance-improvements
Change-Id: I8f68100870ab90cb2d6b68a66a4c97df9ea4ff52
(cherry picked from commit 9ff2ecb031)

ansible/roles/aodh/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling aodh images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/barbican/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling barbican images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/blazar/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling blazar images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/ceilometer/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling ceilometer images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/chrony/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling chrony images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/cinder/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling cinder images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/cloudkitty/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling cloudkitty images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/collectd/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling collectd image
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/common/tasks/pull.yml

@@ -1,10 +1,3 @@
 ---
-- name: Pulling common images
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.enabled | bool
-  with_dict: "{{ common_services }}"

ansible/roles/congress/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling congress images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ congress_services }}"

ansible/roles/cyborg/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling cyborg images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/designate/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling designate images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/elasticsearch/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling elasticsearch images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/etcd/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling etcd image
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/freezer/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling freezer images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/glance/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling glance images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/gnocchi/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling gnocchi images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/grafana/tasks/pull.yml

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

ansible/roles/haproxy/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling haproxy images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/heat/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling heat images
+- import_role:
-  become: true
+    role: service-images-pull
-  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 }}"

ansible/roles/horizon/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling horizon images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ horizon_services }}"

ansible/roles/influxdb/tasks/pull.yml

@@ -1,8 +1,3 @@
 ---
-- name: Pulling influxdb image
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ influxdb_image_full }}"
-  when: inventory_hostname in groups['influxdb']

ansible/roles/ironic/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling ironic images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ ironic_services }}"

ansible/roles/iscsi/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling iscsi images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ iscsi_services }}"

ansible/roles/kafka/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling kafka images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ kafka_services }}"

ansible/roles/karbor/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling karbor images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ karbor_services }}"

ansible/roles/keystone/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling keystone images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ keystone_services }}"

ansible/roles/kibana/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling Kibana image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ kibana_services }}"

ansible/roles/kuryr/tasks/pull.yml

@@ -1,7 +1,3 @@
 ---
-- name: Pulling kuryr image
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ kuryr_image_full }}"

ansible/roles/magnum/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling magnum images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ magnum_services }}"

ansible/roles/manila/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling manila images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ manila_services }}"

ansible/roles/mariadb/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling mariadb image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ mariadb_services }}"

ansible/roles/masakari/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling masakari images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ masakari_services }}"

ansible/roles/memcached/tasks/pull.yml

@@ -1,12 +1,3 @@
 ---
-- name: Pulling memcached image
+- import_role:
-  vars:
+    role: service-images-pull
-    service: "{{ memcached_services.memcached }}"
-  become: true
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ service.image }}"
-  when:
-    - inventory_hostname in groups[service.group]
-    - service.enabled | bool

ansible/roles/mistral/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling mistral images
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  with_dict: "{{ mistral_services }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool

ansible/roles/monasca/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling monasca images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ monasca_services }}"

ansible/roles/mongodb/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling mongodb image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ mongodb_services }}"

ansible/roles/multipathd/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling multipathd image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ multipathd_services }}"

ansible/roles/murano/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling murano images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ murano_services  }}"

ansible/roles/neutron/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling neutron images
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.enabled | bool
-    - item.value.host_in_groups | bool
-  with_dict: "{{ neutron_services }}"

ansible/roles/nova-cell/defaults/main.yml

@@ -1,6 +1,10 @@
 ---
 project_name: "nova"
 
+# NOTE(yoctozepto): we need this for the nova-cell role because this role's
+# vars prefix does not match "{{ project_name }}"
+kolla_role_name: "nova_cell"
+
 nova_cell_services:
   nova-libvirt:
     container_name: nova_libvirt

ansible/roles/nova-cell/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling nova images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ nova_cell_services }}"

ansible/roles/nova/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling nova images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ nova_services }}"

ansible/roles/octavia/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling octavia images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ octavia_services }}"

ansible/roles/openvswitch/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling Openvswitch images
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.enabled | bool
-    - item.value.host_in_groups | bool
-  with_dict: "{{ openvswitch_services }}"

ansible/roles/ovn/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling OVN images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ ovn_services }}"

ansible/roles/ovs-dpdk/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling ovs-dpdk images
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ item.value.image }}"
-  when:
-    - item.value.enabled | bool
-    - item.value.host_in_groups | bool
-  with_dict: "{{ ovsdpdk_services }}"

ansible/roles/panko/tasks/pull.yml

@@ -1,8 +1,3 @@
 ---
-- name: Pulling panko-api image
+- import_role:
-  become: true
+    role: service-images-pull
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ panko_api_image_full }}"
-  when: inventory_hostname in groups['panko-api']

ansible/roles/placement/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling placement images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ placement_services }}"

ansible/roles/prometheus/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling prometheus images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ prometheus_services }}"

ansible/roles/qdrouterd/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling qdrouterd image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ qdrouterd_services }}"

ansible/roles/qinling/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling qinling images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ qinling_services }}"

ansible/roles/rabbitmq/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling rabbitmq image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ rabbitmq_services }}"

ansible/roles/rally/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling rally image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ rally_services }}"

ansible/roles/redis/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling redis images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ redis_services }}"

ansible/roles/sahara/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling sahara images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ sahara_services }}"

ansible/roles/searchlight/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling searchlight images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ searchlight_services }}"

ansible/roles/senlin/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling senlin images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ senlin_services }}"

ansible/roles/service-images-pull/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+- name: "{{ kolla_role_name | default(project_name) }} | Pull images"
+  vars:
+    service: "{{ item.value }}"
+  become: true
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ service.image }}"
+  with_dict: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_services') | select_services_enabled_and_mapped_to_host }}"
+  loop_control:
+    label: "{{ item.key }}"

ansible/roles/skydive/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling skydive images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ skydive_services }}"

ansible/roles/solum/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling solum images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ solum_services }}"

ansible/roles/storm/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling storm images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ storm_services }}"

ansible/roles/tacker/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling tacker images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ tacker_services }}"

ansible/roles/telegraf/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling telegraf image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ telegraf_services }}"

ansible/roles/tempest/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling tempest image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ tempest_services }}"

ansible/roles/trove/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling trove images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ trove_services }}"

ansible/roles/vitrage/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling vitrage images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ vitrage_services }}"

ansible/roles/vmtp/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling vmtp image
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ vmtp_services }}"

ansible/roles/watcher/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling watcher images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ watcher_services }}"

ansible/roles/zookeeper/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling zookeeper images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ zookeeper_services }}"

ansible/roles/zun/tasks/pull.yml

@@ -1,11 +1,3 @@
 ---
-- name: Pulling zun images
+- import_role:
-  become: true
+    role: service-images-pull
-  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: "{{ zun_services }}"

releasenotes/notes/refactor-and-optimise-image-pulling-4346d3c0840ee640.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Optimised image pulling to avoid looping over disabled services.