summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-07-14 10:19:16 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-07-14 10:22:47 -0500
commit67b1806b48566fb7ae2a897c3c3a43cc26a71c89 (patch)
tree582b47acf0b308ab625dee079aa142d8037b20ca
parent540a4ec575caff0f605b992ba811d55a4f0645cb (diff)
by default moving to public End point.
Change-Id: Idfcdc337d2a497e286b79a0cd933f6bbc3753b99 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/openstack.sh3
-rwxr-xr-xjuju/configure-juju-on-openstack2
2 files changed, 2 insertions, 3 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 9d9ca492..118be997 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -99,7 +99,6 @@ create_openrc() {
chmod 0600 ~/joid_config/admin-openrc
source ~/joid_config/admin-openrc
projectid=`openstack project show admin -c id -f value`
- configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v3 RegionOne internalURL $projectid > ~/joid_config/admin-openrc
configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v3 RegionOne publicURL $projectid > ~/joid_config/admin-openrcpublic
else
configOpenrc2 admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
@@ -140,7 +139,7 @@ export KEYSTONE_ENDPOINT_TYPE=$6
export NOVA_ENDPOINT_TYPE=$6
export NEUTRON_ENDPOINT_TYPE=$6
export OS_ENDPOINT_TYPE=$6
-#export OS_INTERFACE=public
+export OS_INTERFACE=public
export OS_AUTH_URL=$4
EOF
}
diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack
index bfcde5b1..ce6b4025 100755
--- a/juju/configure-juju-on-openstack
+++ b/juju/configure-juju-on-openstack
@@ -91,7 +91,7 @@ cd -
swift stat simplestreams
swift post simplestreams --read-acl .r:*
-openstack service create --name product-stream --description "Product Simple Stream" product-streams
+openstack service list product-streams > /dev/null 2>&1 || openstack service create --name product-stream --description "Product Simple Stream" product-streams
SWIFT_URL=`openstack endpoint list --service swift --interface internal -c URL -f value`
openstack endpoint create --region $OS_REGION_NAME product-streams public $SWIFT_URL/simplestreams/images