summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-10-22 16:48:24 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-10-22 17:04:01 -0400
commit7eefcf8a04251da4d10deb936273847d47ccb609 (patch)
tree3a20ef7c6e3ae3efeef7b00982a61c7b3fe0d282 /playbooks/common/openshift-master
parent5aff702d10b79822098ca68f9ee3184be45775d7 (diff)
downloadopenshift-7eefcf8a04251da4d10deb936273847d47ccb609.tar.gz
openshift-7eefcf8a04251da4d10deb936273847d47ccb609.tar.bz2
openshift-7eefcf8a04251da4d10deb936273847d47ccb609.tar.xz
openshift-7eefcf8a04251da4d10deb936273847d47ccb609.zip
Move version greater_than_fact into openshift_facts
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 47e568f06..1dec923fc 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -134,13 +134,10 @@
hosts: oo_masters_to_config
tasks:
- set_fact:
- include_proxy_client_cert: "{{ (openshift.common.version | version_compare('1.0.6', '>')) if openshift.common.deployment_type == 'origin' else (openshift.common.version | version_compare('3.0.2', '>')) }}"
-
- - set_fact:
openshift_master_certs_no_etcd:
- admin.crt
- master.kubelet-client.crt
- - "{{ 'master.proxy-client.crt' if include_proxy_client_cert else omit }}"
+ - "{{ 'master.proxy-client.crt' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}"
- master.server.crt
- openshift-master.crt
- openshift-registry.crt