diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-11 10:33:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-11 10:33:19 +0000 |
| commit | 853f0373293c1f5707875de09910f2c22637de69 (patch) | |
| tree | 254c1a4277866885c4d0df4194bb29bc3297ebc5 | |
| parent | d33931ca1080918598d85bad56f13d02e9962ad4 (diff) | |
| parent | 0995a40100c6cb2892aca78794414055ab4ec713 (diff) | |
| download | kolla-853f0373293c1f5707875de09910f2c22637de69.tar.gz kolla-853f0373293c1f5707875de09910f2c22637de69.zip | |
Merge "Allow mistral role to pull images"
| -rw-r--r-- | ansible/roles/mistral/tasks/deploy.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/mistral/tasks/main.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/mistral/tasks/pull.yml | 21 |
3 files changed, 43 insertions, 14 deletions
diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml new file mode 100644 index 000000000..5f062e5c5 --- /dev/null +++ b/ansible/roles/mistral/tasks/deploy.yml @@ -0,0 +1,16 @@ +--- +- include: register.yml + when: inventory_hostname in groups['mistral-api'] + +- include: config.yml + when: inventory_hostname in groups['mistral-api'] or + inventory_hostname in groups['mistral-engine'] or + inventory_hostname in groups['mistral-executor'] + +- include: bootstrap.yml + when: inventory_hostname in groups['mistral-api'] + +- include: start.yml + when: inventory_hostname in groups['mistral-api'] or + inventory_hostname in groups['mistral-engine'] or + inventory_hostname in groups['mistral-executor'] diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml index 5f062e5c5..e261f83ee 100644 --- a/ansible/roles/mistral/tasks/main.yml +++ b/ansible/roles/mistral/tasks/main.yml @@ -1,16 +1,8 @@ --- -- include: register.yml - when: inventory_hostname in groups['mistral-api'] +- include: "{{ action }}.yml" + when: not common_run -- include: config.yml - when: inventory_hostname in groups['mistral-api'] or - inventory_hostname in groups['mistral-engine'] or - inventory_hostname in groups['mistral-executor'] - -- include: bootstrap.yml - when: inventory_hostname in groups['mistral-api'] - -- include: start.yml - when: inventory_hostname in groups['mistral-api'] or - inventory_hostname in groups['mistral-engine'] or - inventory_hostname in groups['mistral-executor'] +- name: Registering common role has run + set_fact: + common_run: True + when: not common_run diff --git a/ansible/roles/mistral/tasks/pull.yml b/ansible/roles/mistral/tasks/pull.yml new file mode 100644 index 000000000..f8782d9f0 --- /dev/null +++ b/ansible/roles/mistral/tasks/pull.yml @@ -0,0 +1,21 @@ +--- +- name: Pulling mistral-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_api_image_full }}" + when: inventory_hostname in groups['mistral-api'] + +- name: Pulling mistral-engine image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_engine_image_full }}" + when: inventory_hostname in groups['mistral-engine'] + +- name: Pulling mistral-executor image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_executorngine_image_full }}" + when: inventory_hostname in groups['mistral-executor'] |