diff options
| author | SamYaple <sam@yaple.net> | 2016-01-05 17:54:52 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-01-06 04:23:28 +0000 |
| commit | 260187c6fa2b1ba7f3d9fd30e30ad9ce6b81776b (patch) | |
| tree | 606460b92b3f797f244f7e0bad054bf66692f126 | |
| parent | e435042b9beddc87937a998b1587560adbf539f0 (diff) | |
| download | kolla-260187c6fa2b1ba7f3d9fd30e30ad9ce6b81776b.tar.gz kolla-260187c6fa2b1ba7f3d9fd30e30ad9ce6b81776b.zip | |
Allow heat role to pull images
Change-Id: Idce62ce7c1c10c53e8e42091d6c47da4b770c261
Partially-Implements: blueprint pre-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'] |