diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:15:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:15:11 +0000 |
| commit | aa111015fd73b5dd61c0cd142ed6ecf7fac4c24c (patch) | |
| tree | 4474e49eab0f2ee5e8503519938902338dbb4ff5 | |
| parent | ab09cc02157bb5d0266b389b7820705cb86dee55 (diff) | |
| parent | b60bb946d0b8cd4169a2490b5b7afe0daa68a0d3 (diff) | |
| download | kolla-aa111015fd73b5dd61c0cd142ed6ecf7fac4c24c.tar.gz kolla-aa111015fd73b5dd61c0cd142ed6ecf7fac4c24c.zip | |
Merge "Allow glance role to pull images"
| -rw-r--r-- | ansible/roles/glance/tasks/deploy.yml | 25 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/main.yml | 25 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/pull.yml | 14 |
3 files changed, 40 insertions, 24 deletions
diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml new file mode 100644 index 000000000..450db4f93 --- /dev/null +++ b/ansible/roles/glance/tasks/deploy.yml @@ -0,0 +1,25 @@ +--- +- 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'] diff --git a/ansible/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml index 450db4f93..b017e8b4a 100644 --- a/ansible/roles/glance/tasks/main.yml +++ b/ansible/roles/glance/tasks/main.yml @@ -1,25 +1,2 @@ --- -- 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" diff --git a/ansible/roles/glance/tasks/pull.yml b/ansible/roles/glance/tasks/pull.yml new file mode 100644 index 000000000..0a3ebeb58 --- /dev/null +++ b/ansible/roles/glance/tasks/pull.yml @@ -0,0 +1,14 @@ +--- +- 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'] |