aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-03 16:07:00 +0000
committerGerrit Code Review <review@openstack.org>2016-01-03 16:07:00 +0000
commit7920465919f75e389cf683c308b2ec9c1d8de0c8 (patch)
treee6470bdbd8632c3b5ae1d4ebc9c94397cd783e90
parentbe1f686c2c793b8fb5949850aed6de0acc22973d (diff)
parenta84030d66e857751ebd63406af1e845bcf95c0bb (diff)
downloadkolla-7920465919f75e389cf683c308b2ec9c1d8de0c8.tar.gz
kolla-7920465919f75e389cf683c308b2ec9c1d8de0c8.zip
Merge "Convert memcache to kolla_docker"
-rw-r--r--ansible/roles/memcached/tasks/start.yml18
1 files changed, 4 insertions, 14 deletions
diff --git a/ansible/roles/memcached/tasks/start.yml b/ansible/roles/memcached/tasks/start.yml
index a753e14ec..aed1c6a63 100644
--- a/ansible/roles/memcached/tasks/start.yml
+++ b/ansible/roles/memcached/tasks/start.yml
@@ -1,19 +1,9 @@
---
- name: Starting memcached container
- docker:
- tty: True
- net: host
- pull: "{{ docker_pull_policy }}"
- restart_policy: "{{ docker_restart_policy }}"
- restart_policy_retry: "{{ docker_restart_policy_retry }}"
- state: reloaded
- registry: "{{ docker_registry }}"
- username: "{{ docker_registry_username }}"
- password: "{{ docker_registry_password }}"
- insecure_registry: "{{ docker_insecure_registry }}"
- name: memcached
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
image: "{{ memcached_image_full }}"
+ name: "memcached"
volumes: "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['memcached']