diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-05 11:36:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-05 11:36:10 +0000 |
| commit | 900bc1ed026d839081d7cc2d40c702979ca6757e (patch) | |
| tree | cdffd350f91fae858d650c8075aa6f0efa63cdf8 /ansible | |
| parent | 3aeec10b88bfa47d690580b1f78e88a475a858a9 (diff) | |
| parent | 462e8a3b6e5c0dd8d01dec29170b1aa7ff055554 (diff) | |
| download | kolla-900bc1ed026d839081d7cc2d40c702979ca6757e.tar.gz kolla-900bc1ed026d839081d7cc2d40c702979ca6757e.zip | |
Merge "Allow common role to pull images"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/pull.yml | 12 |
3 files changed, 17 insertions, 3 deletions
diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml new file mode 100644 index 000000000..1f16915ad --- /dev/null +++ b/ansible/roles/common/tasks/deploy.yml @@ -0,0 +1,4 @@ +--- +- include: config.yml + +- include: start.yml diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 1f16915ad..b017e8b4a 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,4 +1,2 @@ --- -- include: config.yml - -- include: start.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml new file mode 100644 index 000000000..1bd963bb8 --- /dev/null +++ b/ansible/roles/common/tasks/pull.yml @@ -0,0 +1,12 @@ +--- +- name: Pulling rsyslog image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ rsyslog_image_full }}" + +- name: Pulling kolla-ansible image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ansible_image_full }}" |
