summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-31 17:21:23 -0400
committerMichael Gugino <mgugino@redhat.com>2017-11-14 16:45:59 -0500
commit346ce4fc595ed618e589666a87b441b40e392e73 (patch)
treeb1ff902f89fad74466bcbab7c0d334a49cb7d813 /playbooks/common/openshift-master
parenta7462fda03cd9a749f20f0e5885b3dedefd0447e (diff)
downloadopenshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.gz
openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.bz2
openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.xz
openshift-346ce4fc595ed618e589666a87b441b40e392e73.zip
Removed old version code
This commit removes any references to versions < 1.5/3.5 We assume the version is always greater than or equal to 1.5/3.5.
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml4
-rw-r--r--playbooks/common/openshift-master/tasks/wire_aggregator.yml4
2 files changed, 0 insertions, 8 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index 05b37d59f..4c415ebce 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -32,11 +32,7 @@
- name: verify api server
command: >
curl --silent --tlsv1.2
- {% if openshift.common.version_gte_3_2_or_1_2 | bool %}
--cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
- {% else %}
- --cacert {{ openshift.common.config_base }}/master/ca.crt
- {% endif %}
{{ openshift.master.api_url }}/healthz/ready
args:
# Disables the following warning:
diff --git a/playbooks/common/openshift-master/tasks/wire_aggregator.yml b/playbooks/common/openshift-master/tasks/wire_aggregator.yml
index 0d23e9d61..97acc5d5d 100644
--- a/playbooks/common/openshift-master/tasks/wire_aggregator.yml
+++ b/playbooks/common/openshift-master/tasks/wire_aggregator.yml
@@ -201,11 +201,7 @@
# wait_for port doesn't provide health information.
command: >
curl --silent --tlsv1.2
- {% if openshift.common.version_gte_3_2_or_1_2 | bool %}
--cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
- {% else %}
- --cacert {{ openshift.common.config_base }}/master/ca.crt
- {% endif %}
{{ openshift.master.api_url }}/healthz/ready
args:
# Disables the following warning: