Browse Source

Use public keystone endpoint instead of internal

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
tags/v1.2
Jiří Suchomel 3 months ago
parent
commit
206759c304
1 changed files with 8 additions and 2 deletions
  1. 8
    2
      tools/airship

+ 8
- 2
tools/airship View File

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

Loading…
Cancel
Save