summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-03-23 15:46:03 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-03-23 15:46:03 +0100
commit336feda2a00aca956de266225f7210ac73c2e4b6 (patch)
tree0b8e6ecde230c6125a8457db9c1ae1739c731151
parentb7ed043738342516764318c7804b252083fdd407 (diff)
Adding a fix needed for Fuel virtual deployment
NOT VERIFIED Change-Id: Iabe82f34c6a538646469d72e612f63e51917ae98 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
-rwxr-xr-xutils/fetch_os_creds.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index a5c601b82..88e6b4a69 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -10,7 +10,8 @@
usage() {
- echo "usage: $0 -d <destination> -i <installer_type> -a <installer_ip>" >&2
+ echo "usage: $0 [-v] -d <destination> -i <installer_type> -a <installer_ip>" >&2
+ echo "[-v] Virtualized deployment" >&2
}
info () {
@@ -37,14 +38,15 @@ verify_connectivity() {
error "Can not talk to $ip."
}
-
+: ${DEPLOY_TYPE:=''}
#Get options
-while getopts ":d:i:a:h:" optchar; do
+while getopts ":d:i:a:h:v" optchar; do
case "${optchar}" in
d) dest_path=${OPTARG} ;;
i) installer_type=${OPTARG} ;;
a) installer_ip=${OPTARG} ;;
+ v) DEPLOY_TYPE="virt" ;;
*) echo "Non-option argument: '-${OPTARG}'" >&2
usage
exit 2
@@ -99,6 +101,12 @@ if [ "$installer_type" == "fuel" ]; then
#| grep http | head -1 | cut -d '|' -f 4 | sed 's/v1\/.*/v1\//' | sed 's/ //g') &> /dev/null
#NOTE: this is super ugly sed 's/v1\/.*/v1\//'OS_AUTH_URL
# but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s
+ # Fuel virtual need a fix
+
+ if [ "$DEPLOY_TYPE" == "virt" ]; then
+ echo "INFO: Changing: internalURL -> publicURL in openrc"
+ sed -i 's/internalURL/publicURL/' $dest_path
+ fi
elif [ "$installer_type" == "apex" ]; then
verify_connectivity $installer_ip