summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-14 10:42:42 -0400
committerGitHub <noreply@github.com>2017-03-14 10:42:42 -0400
commit1956134d9d16b9e2960352d3887b985849be1fb1 (patch)
treededcb9d5e2418719d0c3f31d811bc44d6352f84d /roles/openshift_master
parent46d1efcf1e8ab67deaa6c42460bc510650df17b0 (diff)
parent8538ecd50738ada6eb2b7a338a4ceb1cbca71313 (diff)
downloadopenshift-1956134d9d16b9e2960352d3887b985849be1fb1.tar.gz
openshift-1956134d9d16b9e2960352d3887b985849be1fb1.tar.bz2
openshift-1956134d9d16b9e2960352d3887b985849be1fb1.tar.xz
openshift-1956134d9d16b9e2960352d3887b985849be1fb1.zip
Merge pull request #3636 from obuisson/tlsv1.2
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 2ef61cddf..98e0da1a2 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -249,7 +249,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 %}