Merge "fix bug for configure-kubernetes-minion.sh"

This commit is contained in:
Jenkins 2016-07-21 08:52:05 +00:00 committed by Gerrit Code Review
commit 6c265ce10a
2 changed files with 2 additions and 2 deletions

View File

@ -58,7 +58,7 @@ if [ "$VOLUME_DRIVER" = "cinder" ]; then
if [ ! -d ${KUBERNETES} -o ! -f ${CLOUD_CONFIG} ]; then
sudo mkdir -p $KUBERNETES
fi
AUTH_URL=$(echo "$AUTH_URL" | tr -s "v3" "v2")
AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2/')
cat > $CLOUD_CONFIG <<EOF
[Global]
auth-url=$AUTH_URL

View File

@ -58,7 +58,7 @@ if [ "$VOLUME_DRIVER" = "cinder" ]; then
if [ ! -d ${KUBERNETES} -o ! -f ${CLOUD_CONFIG} ]; then
sudo mkdir -p $KUBERNETES
fi
AUTH_URL=$(echo "$AUTH_URL" | tr -s "v3" "v2")
AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2/')
cat > $CLOUD_CONFIG <<EOF
[Global]
auth-url=$AUTH_URL