summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-13 10:36:58 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-14 14:39:26 -0400
commitc298560ff539d23f60a83876feba83c970283ce7 (patch)
treed723e6ea32ad9410d50163049242b3dc5e183c05 /roles/openshift_master
parentee3f0205333840e18c4796e53b0f061fec666333 (diff)
downloadopenshift-c298560ff539d23f60a83876feba83c970283ce7.tar.gz
openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.bz2
openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.xz
openshift-c298560ff539d23f60a83876feba83c970283ce7.zip
The openshift_docker role must set the version facts for containerized installs
QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index afc81a414..6bf28ff2b 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -29,4 +29,4 @@ os_firewall_deny:
- service: former etcd peer port
port: 7001/tcp
-openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}"
+openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag | default(openshift.docker.openshift_image_tag | default(''))) }}"