Jelajahi Sumber

Merge pull request #2707 from sdodson/tlsv12

Where we use curl force it to use tlsv1.2
Scott Dodson 8 tahun lalu
induk
melakukan
4ad4b14403

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

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

+ 1 - 1
roles/openshift_master/handlers/main.yml

@@ -17,7 +17,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_metrics/handlers/main.yml

@@ -17,7 +17,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 %}