X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=blobdiff_plain;f=docker-build%2Fswift%2Fhealthchecker.sh;h=40261a22c28bcabb9167add2e6b1acc4fd9fd2a0;hp=db7df246835d6d3fd7d5d06eef002fd639548b8c;hb=c6a8376d066ec907dbd9cb7aa65b54219f137c9c;hpb=2ed671c54dad28dd81763928b28cd17d5c76df66 diff --git a/docker-build/swift/healthchecker.sh b/docker-build/swift/healthchecker.sh index db7df24..40261a2 100755 --- a/docker-build/swift/healthchecker.sh +++ b/docker-build/swift/healthchecker.sh @@ -13,6 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -SWIFT_AUTH_KEY=$(curl --cacert /etc/swift/tls-proxy/ca.pem -Ss -XGET -i -H"X-Auth-User:${SWIFT_TENANT}:${SWIFT_USER}" -H"X-Auth-Key:${SWIFT_PASS}" https://swift.kube-system.svc.nokia.net:8084/auth/v1.0 | grep X-Auth-Token: | awk "{ print \$2 }") +if [ -z "${SWIFT_URL}" ]; then + echo "Error: missing environment variable: SWIFT_URL" + exit 1 +fi -curl --fail --cacert /etc/swift/tls-proxy/ca.pem -Ss -XGET -H"X-Auth-Token: ${SWIFT_AUTH_KEY}" https://swift.kube-system.svc.nokia.net:8084/v1.0/AUTH_admin +SWIFT_AUTH_KEY=$(curl --cacert /etc/swift/tls-proxy/ca.pem -Ss -XGET -i -H"X-Auth-User:${SWIFT_TENANT}:${SWIFT_USER}" -H"X-Auth-Key:${SWIFT_PASS}" "${SWIFT_URL}/auth/v1.0" | grep X-Auth-Token: | awk "{ print \$2 }") + +curl --fail --cacert /etc/swift/tls-proxy/ca.pem -Ss -XGET -H"X-Auth-Token: ${SWIFT_AUTH_KEY}" "${SWIFT_URL}/v1.0/AUTH_admin"