diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:15:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:15:31 +0000 |
| commit | f16fa6d741fcbe2a09ce04e7d30cbca612a094cb (patch) | |
| tree | 13d2aff200b189af3da09c61c42afd243b202e83 | |
| parent | aa111015fd73b5dd61c0cd142ed6ecf7fac4c24c (diff) | |
| parent | e435042b9beddc87937a998b1587560adbf539f0 (diff) | |
| download | kolla-f16fa6d741fcbe2a09ce04e7d30cbca612a094cb.tar.gz kolla-f16fa6d741fcbe2a09ce04e7d30cbca612a094cb.zip | |
Merge "Allow haproxy role to pull images"
| -rw-r--r-- | ansible/roles/haproxy/tasks/deploy.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/haproxy/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/haproxy/tasks/pull.yml | 14 |
3 files changed, 21 insertions, 5 deletions
diff --git a/ansible/roles/haproxy/tasks/deploy.yml b/ansible/roles/haproxy/tasks/deploy.yml new file mode 100644 index 000000000..ab9215b16 --- /dev/null +++ b/ansible/roles/haproxy/tasks/deploy.yml @@ -0,0 +1,6 @@ +--- +- include: config.yml + when: inventory_hostname in groups['haproxy'] + +- include: start.yml + when: inventory_hostname in groups['haproxy'] diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml index ab9215b16..b017e8b4a 100644 --- a/ansible/roles/haproxy/tasks/main.yml +++ b/ansible/roles/haproxy/tasks/main.yml @@ -1,6 +1,2 @@ --- -- include: config.yml - when: inventory_hostname in groups['haproxy'] - -- include: start.yml - when: inventory_hostname in groups['haproxy'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/haproxy/tasks/pull.yml b/ansible/roles/haproxy/tasks/pull.yml new file mode 100644 index 000000000..f00516806 --- /dev/null +++ b/ansible/roles/haproxy/tasks/pull.yml @@ -0,0 +1,14 @@ +--- +- name: Pulling keepalived image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ keepalived_image_full }}" + when: inventory_hostname in groups['haproxy'] + +- name: Pulling haproxy image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ haproxy_image_full }}" + when: inventory_hostname in groups['haproxy'] |