diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:22:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:22:04 +0000 |
| commit | 0cf0ca01f4ab49efbacc4d511b2d809fd1c0e5cb (patch) | |
| tree | 47fc8a27bce896b45f7a560fc83db05af6e7b952 | |
| parent | 5127c935c405ea708e523dde542ae69ac676eac6 (diff) | |
| parent | b6ac0b2eeffff51a093c8d6b3e1e1af1de672ced (diff) | |
| download | kolla-0cf0ca01f4ab49efbacc4d511b2d809fd1c0e5cb.tar.gz kolla-0cf0ca01f4ab49efbacc4d511b2d809fd1c0e5cb.zip | |
Merge "Allow memcached role to pull images"
| -rw-r--r-- | ansible/roles/memcached/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/memcached/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/memcached/tasks/pull.yml | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ansible/roles/memcached/tasks/deploy.yml b/ansible/roles/memcached/tasks/deploy.yml new file mode 100644 index 000000000..1f16915ad --- /dev/null +++ b/ansible/roles/memcached/tasks/deploy.yml @@ -0,0 +1,4 @@ +--- +- include: config.yml + +- include: start.yml diff --git a/ansible/roles/memcached/tasks/main.yml b/ansible/roles/memcached/tasks/main.yml index 1f16915ad..b017e8b4a 100644 --- a/ansible/roles/memcached/tasks/main.yml +++ b/ansible/roles/memcached/tasks/main.yml @@ -1,4 +1,2 @@ --- -- include: config.yml - -- include: start.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/memcached/tasks/pull.yml b/ansible/roles/memcached/tasks/pull.yml new file mode 100644 index 000000000..1f8a639e8 --- /dev/null +++ b/ansible/roles/memcached/tasks/pull.yml @@ -0,0 +1,7 @@ +--- +- name: Pulling memcached image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ memcached_image_full }}" + when: inventory_hostname in groups['memcached'] |