summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-06-07 13:51:44 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-06-07 13:51:44 -0400
commit12f351d71b13feb4b808b15f6756fbf6a81de587 (patch)
tree8cd3ea02fb98cae19a6288b02abc508b728c8fc0 /roles/openshift_cli/tasks
parent377405b67551ef51ce6f644bde018986465a1e0c (diff)
parentc45c5935df97bb4aa9e8e9067d868371b04a24bf (diff)
downloadopenshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.gz
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.bz2
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.xz
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.zip
Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansible
Diffstat (limited to 'roles/openshift_cli/tasks')
-rw-r--r--roles/openshift_cli/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index bfa60e5b0..c0a712513 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -5,7 +5,7 @@
- name: Pull CLI Image
command: >
- docker pull {{ openshift.common.cli_image }}:{{ openshift_version }}
+ docker pull {{ openshift.common.cli_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }}
when: openshift.common.is_containerized | bool
- name: Create /usr/local/bin/openshift cli wrapper