airship/treasuremap
Code Issues Proposed changes

Use public keystone endpoint instead of internal

Browse Source 
Also, if specific shipyard password is defined,
pass it on to shipyard component instead of OS_PASSWORD
(which might be defined with the value for another cloud).

Change-Id: I42d9797c8177ad4da2b401f874fb21a00e045883
This commit is contained in:
Jiří Suchomel 2019-07-03 17:51:46 +02:00 committed by Kaspars Skels
parent 00cbd30abf
commit 206759c304
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/airship
View File

@ -29,13 +29,19 @@ fi
ENV_FILE=$(mktemp) ENV_FILE=$(mktemp)
trap "{ rm -f $ENV_FILE; }" EXIT trap "{ rm -f $ENV_FILE; }" EXIT
export OS_PASSWORD=${OS_PASSWORD:-password123}
# If shipyard password is defined, provide it to shipyard component
if [ "$1" = "shipyard" ] && [ -n "$OS_SHIPYARD_PASSWORD" ]; then
export OS_PASSWORD=${OS_SHIPYARD_PASSWORD}
fi
# prepare docker environment file # prepare docker environment file
cat > $ENV_FILE << EOF cat > $ENV_FILE << EOF
PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-password123} PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-password123}
PEGLEG_SALT=${PEGLEG_SALT:-password123} PEGLEG_SALT=${PEGLEG_SALT:-password123}
OS_AUTH_URL=${OS_AUTH_URL:-http://keystone-api.ucp.svc.cluster.local:5000/v3} OS_AUTH_URL=${OS_AUTH_URL:-http://keystone.ucp.svc.cluster.local:80/v3}
OS_PASSWORD=${OS_PASSWORD:-password123} OS_PASSWORD=${OS_PASSWORD}
OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default} OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default}
OS_PROJECT_NAME=${OS_PROJECT_NAME:-service} OS_PROJECT_NAME=${OS_PROJECT_NAME:-service}
OS_USERNAME=${OS_USERNAME:-shipyard} OS_USERNAME=${OS_USERNAME:-shipyard}