summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-24 09:46:33 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:32 -0300
commit0c7433838c8c6409b8de907fcc946fc73fe90527 (patch)
tree0e0138faf3cb685ac8dd51df79ee25f50c1111b6 /playbooks/common
parent82a70f9cc1522d239212701ab6c9260cbf9dc8a7 (diff)
downloadopenshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.gz
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.bz2
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.xz
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.zip
Work towards determining openshift_version when unspecified.
openshift_docker role was largely useless now, but also almost did what we needed. (deps ordering still needs to be changed) Remove defaulting of openshift_version.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 17afbb48c..380875a30 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -175,8 +175,8 @@
when: openshift.common.is_containerized | bool and openshift_image_tag is defined
- name: Determine version to configure if already installed
set_fact:
- openshift_version: "{{ openshift.common.version }}"
- when: openshift.common.is_containerized | bool and openshift.common.version is defined
+ openshift_version: "{{ openshift.common.version_requested }}"
+ when: openshift.common.is_containerized | bool and openshift.common.version_requested is defined
- debug: var=openshift_version
- name: Determine if master certificates need to be generated
@@ -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: