diff options
| author | SamYaple <sam@yaple.net> | 2016-01-05 17:48:46 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-01-06 04:23:28 +0000 |
| commit | b60bb946d0b8cd4169a2490b5b7afe0daa68a0d3 (patch) | |
| tree | 77d7633c22e6392924508c3a04f75bcb5f6e01ad | |
| parent | 912bce7b3eefad9c918256ba77c325a4cc4931ea (diff) | |
| download | kolla-b60bb946d0b8cd4169a2490b5b7afe0daa68a0d3.tar.gz kolla-b60bb946d0b8cd4169a2490b5b7afe0daa68a0d3.zip | |
Allow glance role to pull images
Change-Id: Ib5c22c7416bdc7ce83123b79fa7b08afda7595bc
Partially-Implements: blueprint pre-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'] |