summaryrefslogtreecommitdiffstats
path: root/roles/openshift_version/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-28 09:34:52 -0500
committerGitHub <noreply@github.com>2017-11-28 09:34:52 -0500
commit34de448dd7ff5c671628092e51668aa5c89e8e74 (patch)
tree5ccd85720b9718d0b7886b8efd1a7f4e8180c749 /roles/openshift_version/tasks
parent374749dd54f4c111d1c2cb6044dc9f961a4f36ce (diff)
parent8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a (diff)
downloadopenshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.gz
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.bz2
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.xz
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.zip
Merge pull request #6280 from mgugino-upstream-stage/cli_image
Remove openshift.common.cli_image
Diffstat (limited to 'roles/openshift_version/tasks')
-rw-r--r--roles/openshift_version/tasks/set_version_containerized.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml
index b727eb74d..574e89899 100644
--- a/roles/openshift_version/tasks/set_version_containerized.yml
+++ b/roles/openshift_version/tasks/set_version_containerized.yml
@@ -20,7 +20,7 @@
- name: Lookup latest containerized version if no version specified
command: >
- docker run --rm {{ openshift.common.cli_image }}:latest version
+ docker run --rm {{ openshift_cli_image }}:latest version
register: cli_image_version
when:
- openshift_version is not defined
@@ -43,7 +43,7 @@
# and use that value instead.
- name: Set precise containerized version to configure if openshift_release specified
command: >
- docker run --rm {{ openshift.common.cli_image }}:v{{ openshift_version }} version
+ docker run --rm {{ openshift_cli_image }}:v{{ openshift_version }} version
register: cli_image_version
when:
- openshift_version is defined