summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_ca
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/openshift_master_ca
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/openshift_master_ca')
-rw-r--r--roles/openshift_master_ca/tasks/main.yml10
1 files changed, 2 insertions, 8 deletions
diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml
index 5b4c92f2b..6d9be81c0 100644
--- a/roles/openshift_master_ca/tasks/main.yml
+++ b/roles/openshift_master_ca/tasks/main.yml
@@ -13,16 +13,10 @@
path: "{{ openshift_master_config_dir }}"
state: directory
-- name: Get docker images
- command: docker images
- changed_when: false
- when: openshift.common.is_containerized | bool
- register: docker_images
-
-- name: Pull required docker image
+- name: Pull master docker image
command: >
docker pull {{ openshift.common.cli_image }}
- when: openshift.common.is_containerized | bool and openshift.common.cli_image not in docker_images.stdout
+ when: openshift.common.is_containerized | bool
- name: Create the master certificates if they do not already exist
command: >