From: Guillaume Abrioux Date: Tue, 20 Aug 2019 09:47:48 +0000 (+0200) Subject: handler: do not validate the server certificate against the CA X-Git-Tag: v4.0.0rc14~19 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fcf571430b44584af2335c7cf95b832504aa0b11;p=ceph-ansible.git handler: do not validate the server certificate against the CA Otherwise rgw handler ends up with an error when using https. Signed-off-by: Guillaume Abrioux (cherry picked from commit 9329bbb3af8b60a0cc1f5eec2129d67bb6aecff6) --- diff --git a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 index 65f0e315f..f9ca7ae40 100644 --- a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 +++ b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 @@ -44,11 +44,11 @@ check_socket() { check_for_curl_or_wget() { local i=$1 if ${DOCKER_EXECS[i]} command -v wget &>/dev/null; then - rgw_test_command="wget --tries 1 --quiet -O /dev/null" + rgw_test_command="wget --no-check-certificate --tries 1 --quiet -O /dev/null" elif ${DOCKER_EXECS[i]} command -v curl &>/dev/null; then - rgw_test_command="curl --fail --silent --output /dev/null" + rgw_test_command="curl -k --fail --silent --output /dev/null" else - echo "It seems that neither curl or wget are available on your system." + echo "It seems that neither curl nor wget are available on your system." echo "Cannot test rgw connection." exit 0 fi