From 9d1c95d840ecaa9a40d1dda801f6234c0692121d Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 13 Dec 2017 10:20:04 -0600 Subject: added OS_interface and password mechanism. Change-Id: I94200b129287249f714d74e5ae768bb0fcd57eb8 Signed-off-by: Narinder Gupta (cherry picked from commit c129114d52a84187f9eeca21a46fa68567603c97) --- ci/openstack.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/openstack.sh b/ci/openstack.sh index a7d91fb6..f4afa202 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 -- cgit 1.2.3-korg