summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-02 15:37:01 -0400
committerGitHub <noreply@github.com>2016-11-02 15:37:01 -0400
commit4ad4b14403fca7220dd10657b6fa723b9e2bae05 (patch)
treed2aaedc764283fbfae776bdfee2eb88e5e6d9bc7 /playbooks/common
parent76fca28ea37a791447974a823dc00508fbcd243a (diff)
parent022530f6c3918816f1461e756f1e9a9001364abb (diff)
downloadopenshift-4ad4b14403fca7220dd10657b6fa723b9e2bae05.tar.gz
openshift-4ad4b14403fca7220dd10657b6fa723b9e2bae05.tar.bz2
openshift-4ad4b14403fca7220dd10657b6fa723b9e2bae05.tar.xz
openshift-4ad4b14403fca7220dd10657b6fa723b9e2bae05.zip
Merge pull request #2707 from sdodson/tlsv12
Where we use curl force it to use tlsv1.2
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index 56ed09e1b..18e5c665f 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -33,7 +33,7 @@
service: name={{ openshift.common.service_type }}-master-controllers state=restarted
- name: verify api server
command: >
- curl --silent
+ 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 %}
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 5191662f7..4824eeef3 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -165,7 +165,7 @@
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
command: >
- curl --silent
+ 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 %}