Skip to content

Commit

Permalink
ceph-handler: fix curl ipv6 command with rgw
Browse files Browse the repository at this point in the history
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 cdb7b09)
  • Loading branch information
dsavineau committed Nov 2, 2020
1 parent b5985d2 commit fa83929
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
Expand Up @@ -48,7 +48,7 @@ check_for_curl_or_wget() {
if ${DOCKER_EXECS[i]} command -v wget &>/dev/null; then
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 -k --fail --silent --output /dev/null"
rgw_test_command="curl {{ '-g' if ip_version == 'ipv6' else '' }} -k --fail --silent --output /dev/null"
else
echo "It seems that neither curl nor wget are available on your system."
echo "Cannot test rgw connection."
Expand Down

0 comments on commit fa83929

Please sign in to comment.