summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-12-13 10:20:04 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-12-13 16:38:20 +0000
commit9d1c95d840ecaa9a40d1dda801f6234c0692121d (patch)
treeef7bbd93785fdf66c5acb140fc1022af41e58005
parentd27608283966794e0b93cd9ce12412f6ab8d16e4 (diff)
added OS_interface and password mechanism.
Change-Id: I94200b129287249f714d74e5ae768bb0fcd57eb8 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com> (cherry picked from commit c129114d52a84187f9eeca21a46fa68567603c97)
-rwxr-xr-xci/openstack.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index a7d91fb..f4afa20 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -72,7 +72,7 @@ create_openrc() {
mkdir -m 0700 -p cloud
keystoneIp=$(keystoneIp)
- adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
+ adminPasswd=$(juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['admin-password']['value']" | cut -d " " -f 1)
v3api=`juju config keystone preferred-api-version`
@@ -116,6 +116,7 @@ export OS_PROJECT_NAME=$3
export OS_PASSWORD=$2
export OS_IDENTITY_API_VERSION=3
export OS_REGION_NAME=$5
+export OS_INTERFACE=public
#export OS_INSECURE=true
#export OS_CASSL=~/joid_config/ca.pem
EOF