diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
| commit | 3bed4d0c4bda1b6332ec547502663d09e98b89d1 (patch) | |
| tree | f64e0d0c7e9bc06a76d727050047053cf1a30a6a /roles/openshift_master_ca | |
| parent | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (diff) | |
| parent | ee3aec770b6b1a2b0212b432a920e3d846e56044 (diff) | |
| download | openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.gz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.bz2 openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.xz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.zip | |
Merge pull request #1214 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master_ca')
| -rw-r--r-- | roles/openshift_master_ca/tasks/main.yml | 10 |
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: > |