diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:19:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:19:01 +0000 |
| commit | 5b7e37d199dc5d865cb33efa81e12a7fc7d3b689 (patch) | |
| tree | 545a25088cc0900f769476d9de0a6a0a6e0e878c | |
| parent | 9dc5c30b396d8e684a8db9596e1df68853daaeb6 (diff) | |
| parent | b7aca3f90eabc2c09ffdf793873b1c6589cf0db0 (diff) | |
| download | kolla-5b7e37d199dc5d865cb33efa81e12a7fc7d3b689.tar.gz kolla-5b7e37d199dc5d865cb33efa81e12a7fc7d3b689.zip | |
Merge "Allow ironic role to pull images"
| -rw-r--r-- | ansible/roles/ironic/tasks/deploy.yml | 18 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/main.yml | 18 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/pull.yml | 28 |
3 files changed, 47 insertions, 17 deletions
diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml new file mode 100644 index 000000000..e32778aee --- /dev/null +++ b/ansible/roles/ironic/tasks/deploy.yml @@ -0,0 +1,18 @@ +--- +- include: register.yml + when: inventory_hostname in groups['ironic-api'] + +- include: config.yml + when: inventory_hostname in groups['ironic-api'] or + inventory_hostname in groups['ironic-conductor'] or + inventory_hostname in groups['ironic-discoverd'] or + inventory_hostname in groups['ironic-pxe'] + +- include: bootstrap.yml + when: inventory_hostname in groups['ironic-api'] + +- include: start.yml + when: inventory_hostname in groups['ironic-api'] or + inventory_hostname in groups['ironic-conductor'] or + inventory_hostname in groups['ironic-discoverd'] or + inventory_hostname in groups['ironic-pxe'] diff --git a/ansible/roles/ironic/tasks/main.yml b/ansible/roles/ironic/tasks/main.yml index e32778aee..b017e8b4a 100644 --- a/ansible/roles/ironic/tasks/main.yml +++ b/ansible/roles/ironic/tasks/main.yml @@ -1,18 +1,2 @@ --- -- include: register.yml - when: inventory_hostname in groups['ironic-api'] - -- include: config.yml - when: inventory_hostname in groups['ironic-api'] or - inventory_hostname in groups['ironic-conductor'] or - inventory_hostname in groups['ironic-discoverd'] or - inventory_hostname in groups['ironic-pxe'] - -- include: bootstrap.yml - when: inventory_hostname in groups['ironic-api'] - -- include: start.yml - when: inventory_hostname in groups['ironic-api'] or - inventory_hostname in groups['ironic-conductor'] or - inventory_hostname in groups['ironic-discoverd'] or - inventory_hostname in groups['ironic-pxe'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/ironic/tasks/pull.yml b/ansible/roles/ironic/tasks/pull.yml new file mode 100644 index 000000000..9ee19f977 --- /dev/null +++ b/ansible/roles/ironic/tasks/pull.yml @@ -0,0 +1,28 @@ +--- +- name: Pulling ironic-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ironic_api_image_full }}" + when: inventory_hostname in groups['ironic-api'] + +- name: Pulling ironic-conductor image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ironic_conductor_image_full }}" + when: inventory_hostname in groups['ironic-conductor'] + +- name: Pulling ironic-discoverd image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ironic_discoverd_image_full }}" + when: inventory_hostname in groups['ironic-discoverd'] + +- name: Pulling ironic-pxe image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ironic_pxe_image_full }}" + when: inventory_hostname in groups['ironic-pxe'] |