diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:22:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:22:48 +0000 |
| commit | d9762fe61ed6afc212fd8dbf586810b9be8713ab (patch) | |
| tree | b9fb00f28331aca297ebadf99d51ca5c66f8c099 | |
| parent | 0cf0ca01f4ab49efbacc4d511b2d809fd1c0e5cb (diff) | |
| parent | e764e8522d0acdadda9c745a9f46b384b8aea368 (diff) | |
| download | kolla-d9762fe61ed6afc212fd8dbf586810b9be8713ab.tar.gz kolla-d9762fe61ed6afc212fd8dbf586810b9be8713ab.zip | |
Merge "Allow murano role to pull images"
| -rw-r--r-- | ansible/roles/murano/tasks/deploy.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/pull.yml | 14 |
3 files changed, 29 insertions, 13 deletions
diff --git a/ansible/roles/murano/tasks/deploy.yml b/ansible/roles/murano/tasks/deploy.yml new file mode 100644 index 000000000..13d644732 --- /dev/null +++ b/ansible/roles/murano/tasks/deploy.yml @@ -0,0 +1,14 @@ +--- +- include: register.yml + when: inventory_hostname in groups['murano-api'] + +- include: config.yml + when: inventory_hostname in groups['murano-api'] or + inventory_hostname in groups['murano-engine'] + +- include: bootstrap.yml + when: inventory_hostname in groups['murano-api'] + +- include: start.yml + when: inventory_hostname in groups['murano-api'] or + inventory_hostname in groups['murano-engine'] diff --git a/ansible/roles/murano/tasks/main.yml b/ansible/roles/murano/tasks/main.yml index 13d644732..b017e8b4a 100644 --- a/ansible/roles/murano/tasks/main.yml +++ b/ansible/roles/murano/tasks/main.yml @@ -1,14 +1,2 @@ --- -- include: register.yml - when: inventory_hostname in groups['murano-api'] - -- include: config.yml - when: inventory_hostname in groups['murano-api'] or - inventory_hostname in groups['murano-engine'] - -- include: bootstrap.yml - when: inventory_hostname in groups['murano-api'] - -- include: start.yml - when: inventory_hostname in groups['murano-api'] or - inventory_hostname in groups['murano-engine'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/murano/tasks/pull.yml b/ansible/roles/murano/tasks/pull.yml new file mode 100644 index 000000000..5f979e56a --- /dev/null +++ b/ansible/roles/murano/tasks/pull.yml @@ -0,0 +1,14 @@ +--- +- name: Pulling murano-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ murano_api_image_full }}" + when: inventory_hostname in groups['murano-api'] + +- name: Pulling murano-engine image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ murano_engine_image_full }}" + when: inventory_hostname in groups['murano-engine'] |