Skip to content

Commit 4691bc5

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "Refactor and optimise image pulling" into stable/wallaby
2 parents a30616e + 939fad0 commit 4691bc5

File tree

68 files changed

+150
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+150
-637
lines changed

‎ansible/roles/aodh/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling aodh images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ aodh_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/barbican/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling barbican images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ barbican_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/blazar/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling blazar images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ blazar_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/ceilometer/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling ceilometer images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ ceilometer_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/chrony/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling chrony images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ chrony_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/cinder/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling cinder images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ cinder_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/cloudkitty/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling cloudkitty images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ cloudkitty_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/collectd/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling collectd image
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ collectd_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/common/tasks/pull.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
---
2-
- name: Pulling common images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- item.value | service_enabled_and_mapped_to_host
10-
with_dict: "{{ common_services }}"
2+
- import_role:
3+
role: service-images-pull

‎ansible/roles/cyborg/tasks/pull.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
---
2-
- name: Pulling cyborg images
3-
become: true
4-
kolla_docker:
5-
action: "pull_image"
6-
common_options: "{{ docker_common_options }}"
7-
image: "{{ item.value.image }}"
8-
when:
9-
- inventory_hostname in groups[item.value.group]
10-
- item.value.enabled | bool
11-
with_dict: "{{ cyborg_services }}"
2+
- import_role:
3+
role: service-images-pull

0 commit comments

Comments
 (0)