diff options
| -rwxr-xr-x | ci/openstack.sh | 4 | ||||
| -rwxr-xr-x | juju/configure-juju-on-openstack | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh index 118be997..0a90b425 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -99,7 +99,9 @@ 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 publicURL $projectid > ~/joid_config/admin-openrcpublic + configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v3 RegionOne publicURL $projectid > ~/joid_config/admin-openrcinternal + urlapi=`openstack catalog show keystone --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['endpoints']" | grep public | cut -d " " -f 4` + configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid > ~/joid_config/admin-openrc else configOpenrc2 admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc chmod 0600 ~/joid_config/admin-openrc diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack index ce6b4025..1d98fd08 100755 --- a/juju/configure-juju-on-openstack +++ b/juju/configure-juju-on-openstack @@ -52,7 +52,7 @@ mkdir -p ~/simplestreams/images #Now, if necessary, source the nova.rc file for your cloud: -. ~/joid_config/admin-openrcpublic +. ~/joid_config/admin-openrc #We can now determine the region name for the cloud by running: @@ -91,9 +91,9 @@ cd - swift stat simplestreams swift post simplestreams --read-acl .r:* -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 service show product-streams > /dev/null 2>&1 || openstack service create --name product-streams --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 openstack endpoint create --region $OS_REGION_NAME product-streams internal $SWIFT_URL/simplestreams/images @@ -124,7 +124,7 @@ juju add-credential openstack -f os-creds.yaml --replace #Bootstrap with Juju -juju bootstrap openstack --config image-metadata-url=$SWIFT_URL/simplestreams/images --config use-floating-ip=true --config network=private +juju bootstrap openstack --debug --config image-metadata-url=$SWIFT_URL/simplestreams/images --config use-floating-ip=true --config network=private juju gui --show-credentials --no-browser #Print the address of Juju-gui for deployments on Openstack |