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

ceph-handler: fix curl ipv6 command with rgw 

When using the curl command with ipv6 address and brackets then we need
to use the -g option otherwise the command fails.

$ curl http://[fdc2:328:750b:6983::6]:8080
curl: (3) [globbing] error: bad range specification after pos 9

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit cdb7b09cd7)
pull/5995/head
Dimitri Savineau 2020-10-22 15:05:12 -04:00 committed by Dimitri Savineau
parent 12e06d07c8
commit 34a310e5f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ check_for_curl_or_wget() {
if ${DOCKER_EXECS[i]} command -v wget &>/dev/null; then if ${DOCKER_EXECS[i]} command -v wget &>/dev/null; then
rgw_test_command="wget --no-check-certificate --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 -k --fail --silent --output /dev/null" rgw_test_command="curl {{ '-g' if ip_version == 'ipv6' else '' }} -k --fail --silent --output /dev/null"
else else
echo "It seems that neither curl nor 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."