diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:20:10 +0000 |
| commit | 38188c6b530fabcf0d718c5746fa47f21c2502be (patch) | |
| tree | b2e412244cb72f801cf608bb1e735a6f3a231412 | |
| parent | 2c7ae58dfb602c766ca5d014cb49211ed6a5211f (diff) | |
| parent | 06356a8b0f5a44a8b2f0ae2b89c813832e37b3dc (diff) | |
| download | kolla-38188c6b530fabcf0d718c5746fa47f21c2502be.tar.gz kolla-38188c6b530fabcf0d718c5746fa47f21c2502be.zip | |
Merge "Allow magnum role to pull images"
| -rw-r--r-- | ansible/roles/magnum/tasks/deploy.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/pull.yml | 14 |
3 files changed, 29 insertions, 13 deletions
diff --git a/ansible/roles/magnum/tasks/deploy.yml b/ansible/roles/magnum/tasks/deploy.yml new file mode 100644 index 000000000..50e56814a --- /dev/null +++ b/ansible/roles/magnum/tasks/deploy.yml @@ -0,0 +1,14 @@ +--- +- include: register.yml + when: inventory_hostname in groups['magnum-api'] + +- include: config.yml + when: inventory_hostname in groups['magnum-api'] or + inventory_hostname in groups['magnum-conductor'] + +- include: bootstrap.yml + when: inventory_hostname in groups['magnum-api'] + +- include: start.yml + when: inventory_hostname in groups['magnum-api'] or + inventory_hostname in groups['magnum-conductor'] diff --git a/ansible/roles/magnum/tasks/main.yml b/ansible/roles/magnum/tasks/main.yml index 50e56814a..b017e8b4a 100644 --- a/ansible/roles/magnum/tasks/main.yml +++ b/ansible/roles/magnum/tasks/main.yml @@ -1,14 +1,2 @@ --- -- include: register.yml - when: inventory_hostname in groups['magnum-api'] - -- include: config.yml - when: inventory_hostname in groups['magnum-api'] or - inventory_hostname in groups['magnum-conductor'] - -- include: bootstrap.yml - when: inventory_hostname in groups['magnum-api'] - -- include: start.yml - when: inventory_hostname in groups['magnum-api'] or - inventory_hostname in groups['magnum-conductor'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/magnum/tasks/pull.yml b/ansible/roles/magnum/tasks/pull.yml new file mode 100644 index 000000000..3825c7520 --- /dev/null +++ b/ansible/roles/magnum/tasks/pull.yml @@ -0,0 +1,14 @@ +--- +- name: Pulling magnum-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ magnum_api_image_full }}" + when: inventory_hostname in groups['magnum-api'] + +- name: Pulling magnum-conductor image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ magnum_conductor_image_full }}" + when: inventory_hostname in groups['magnum-conductor'] |