Bladeren bron

Merge pull request #3636 from obuisson/tlsv1.2

Merged by openshift-bot
OpenShift Bot 8 jaren geleden
bovenliggende
commit
1956134d9d
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      roles/openshift_master/tasks/main.yml
  2. 1 1
      roles/openshift_node/tasks/main.yml

+ 1 - 1
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 %}

+ 1 - 1
roles/openshift_node/tasks/main.yml

@@ -153,7 +153,7 @@
   # Using curl here since the uri module requires python-httplib2 and
   # wait_for port doesn't provide health information.
   command: >
-    curl --silent --cacert {{ openshift.common.config_base }}/node/ca.crt
+    curl --silent --tlsv1.2 --cacert {{ openshift.common.config_base }}/node/ca.crt
     {{ openshift_node_master_api_url }}/healthz/ready
   args:
     # Disables the following warning: