ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <gabrioux@redhat.com>
(cherry picked from commit 9329bbb3af)
pull/4367/head
Guillaume Abrioux 2019-08-20 11:47:48 +02:00
parent 15646d1030
commit fcf571430b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
View File

@ -44,11 +44,11 @@ check_socket() {
check_for_curl_or_wget() { check_for_curl_or_wget() {
local i=$1 local i=$1
if ${DOCKER_EXECS[i]} command -v wget &>/dev/null; then 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 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 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." echo "Cannot test rgw connection."
exit 0 exit 0
fi fi