summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks/main.yml
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-11 13:49:32 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-11 13:49:32 -0500
commit6d2e202d514784df66b4f663ae725da7ef4499ae (patch)
tree8e6d6287ce843d4f74ecc8e5db0b3e9da9326654 /roles/etcd/tasks/main.yml
parent7c48bcc8a708828ff78a4b239eca6cf60531f5e2 (diff)
parent8be4562550db9285039738173607cce446979190 (diff)
downloadopenshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.gz
openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.bz2
openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.xz
openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.zip
Merge pull request #1097 from sdodson/containers
Always pull images
Diffstat (limited to 'roles/etcd/tasks/main.yml')
-rw-r--r--roles/etcd/tasks/main.yml16
1 files changed, 0 insertions, 16 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index e83cfc33c..1e97b047b 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -11,24 +11,8 @@
action: "{{ ansible_pkg_mgr }} name=etcd-2.* state=present"
when: not openshift.common.is_containerized | bool
-- name: Get docker images
- command: docker images
- changed_when: false
- when: openshift.common.is_containerized | bool
- register: docker_images
-
- name: Pull etcd container
command: docker pull {{ openshift.etcd.etcd_image }}
- when: openshift.common.is_containerized | bool and openshift.etcd.etcd_image not in docker_images.stdout
-
-- name: Wait for etcd image
- command: >
- docker images
- register: docker_images
- until: openshift.etcd.etcd_image in docker_images.stdout
- retries: 30
- delay: 10
- changed_when: false
when: openshift.common.is_containerized | bool
- name: Install etcd container service file