github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[OpenStack-Heat] Fix regex used to get object-store URL

Browse Source 
"publicURL" is used for endpoints in the Identity v2 API, while in the
Identity v3 API it has been changed to just "public"

Fixes #40102
This commit is contained in:
Sean M. Collins 2017-01-18 15:32:05 -05:00
parent d946751924
commit 8ad7e1613a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/openstack-heat/util.sh
View File

@ -186,7 +186,13 @@ function run-heat-script() {
# Automatically detect swift url if it wasn't specified # Automatically detect swift url if it wasn't specified
if [[ -z $SWIFT_SERVER_URL ]]; then if [[ -z $SWIFT_SERVER_URL ]]; then
SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "publicURL: (.+)$" | cut -d" " -f2) local rgx=""
if [ "$OS_IDENTITY_API_VERSION" = "3" ]; then
rgx="public: (.+)$"
else
rgx="publicURL: (.+)$"
fi
SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "$rgx" | cut -d" " -f2)
fi fi
local swift_repo_url="${SWIFT_SERVER_URL}/kubernetes" local swift_repo_url="${SWIFT_SERVER_URL}/kubernetes"