summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-24 11:13:33 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:32 -0300
commit436c287335c3b578aaa2c1c8835583feaee2a3cf (patch)
tree44afc60d54c855cdf32c1c84553a6a2435b6d399 /playbooks/common/openshift-master
parent0c7433838c8c6409b8de907fcc946fc73fe90527 (diff)
downloadopenshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.gz
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.bz2
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.xz
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.zip
Stop downgrading Docker because we don't know what version to install yet.
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 380875a30..206e92c16 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -376,7 +376,7 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- #openshift_version: "{{ g_openshift_version_requested }}"
+ openshift_version: "{{ g_openshift_version_requested }}"
when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
pre_tasks: