diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:17:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:17:20 +0000 |
| commit | 8c54c82b7dac4dd1cf2e952c62ad8d89920ba7d1 (patch) | |
| tree | 4c1b2187e8ccd29bcd29e7e0740937613300965a | |
| parent | f16fa6d741fcbe2a09ce04e7d30cbca612a094cb (diff) | |
| parent | 260187c6fa2b1ba7f3d9fd30e30ad9ce6b81776b (diff) | |
| download | kolla-8c54c82b7dac4dd1cf2e952c62ad8d89920ba7d1.tar.gz kolla-8c54c82b7dac4dd1cf2e952c62ad8d89920ba7d1.zip | |
Merge "Allow heat role to pull images"
| -rw-r--r-- | ansible/roles/heat/tasks/deploy.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/heat/tasks/main.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/heat/tasks/pull.yml | 21 |
3 files changed, 38 insertions, 15 deletions
diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml new file mode 100644 index 000000000..a27fbf2cc --- /dev/null +++ b/ansible/roles/heat/tasks/deploy.yml @@ -0,0 +1,16 @@ +--- +- include: register.yml + when: inventory_hostname in groups['heat-api'] + +- include: config.yml + when: inventory_hostname in groups['heat-api'] or + inventory_hostname in groups['heat-api-cfn'] or + inventory_hostname in groups['heat-engine'] + +- include: bootstrap.yml + when: inventory_hostname in groups['heat-api'] + +- include: start.yml + when: inventory_hostname in groups['heat-api'] or + inventory_hostname in groups['heat-api-cfn'] or + inventory_hostname in groups['heat-engine'] diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml index a27fbf2cc..b017e8b4a 100644 --- a/ansible/roles/heat/tasks/main.yml +++ b/ansible/roles/heat/tasks/main.yml @@ -1,16 +1,2 @@ --- -- include: register.yml - when: inventory_hostname in groups['heat-api'] - -- include: config.yml - when: inventory_hostname in groups['heat-api'] or - inventory_hostname in groups['heat-api-cfn'] or - inventory_hostname in groups['heat-engine'] - -- include: bootstrap.yml - when: inventory_hostname in groups['heat-api'] - -- include: start.yml - when: inventory_hostname in groups['heat-api'] or - inventory_hostname in groups['heat-api-cfn'] or - inventory_hostname in groups['heat-engine'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/heat/tasks/pull.yml b/ansible/roles/heat/tasks/pull.yml new file mode 100644 index 000000000..b671b7b25 --- /dev/null +++ b/ansible/roles/heat/tasks/pull.yml @@ -0,0 +1,21 @@ +--- +- name: Pulling heat-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ heat_api_image_full }}" + when: inventory_hostname in groups['heat-api'] + +- name: Pulling heat-api-cfn image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ heat_api_cfn_image_full }}" + when: inventory_hostname in groups['heat-api-cfn'] + +- name: Pulling heat-engine image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ heat_engine_image_full }}" + when: inventory_hostname in groups['heat-engine'] |