by default moving to public End point.

Change-Id: Idfcdc337d2a497e286b79a0cd933f6bbc3753b99
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 9d9ca49..118be99 100755 (executable)
--- 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 bfcde5b..ce6b402 100755 (executable)
--- 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