From 11c271189621b35535f2611793e68da467ff3e10 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Thu, 7 Jun 2012 14:09:18 +0100 Subject: [PATCH 1/3] Adjusting quantum and glance endpoints --- files/default_catalog.templates | 8 +++++--- stack.sh | 17 ++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/files/default_catalog.templates b/files/default_catalog.templates index 66052b6add..2c144eaa79 100644 --- a/files/default_catalog.templates +++ b/files/default_catalog.templates @@ -30,7 +30,9 @@ catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT% catalog.RegionOne.s3.name = S3 Service -catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292 -catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292 -catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292 +catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1 +catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1 +catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1 catalog.RegionOne.image.name = Image Service +catalog.RegionOne.image.versionId = 1.0 + diff --git a/stack.sh b/stack.sh index bb6e1ae146..a171999759 100755 --- a/stack.sh +++ b/stack.sh @@ -1896,13 +1896,15 @@ if is_service_enabled key; then echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG fi - # Add quantum endpoints to service catalog if quantum is enabled - if is_service_enabled quantum; then - echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG - echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG - echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG - echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG - fi + # Add quantum endpoints to service catalog if quantum is enabled + if is_service_enabled quantum; then + echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/v1.0/tenants/$(tenant_id)s" >> $KEYSTONE_CATALOG + echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG + echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/v1.0/tenants/$(tenant_id)s" >> $KEYSTONE_CATALOG + echo "catalog.RegionOne.network.tenantId = $(tenant_id)s" >> $KEYSTONE_CATALOG + echo "catalog.RegionOne.network.versionId = 1.0" >> $KEYSTONE_CATALOG + echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG + fi sudo sed -e " s,%SERVICE_HOST%,$SERVICE_HOST,g; @@ -2157,3 +2159,4 @@ fi # Indicate how long this took to run (bash maintained variable 'SECONDS') echo "stack.sh completed in $SECONDS seconds." + From d6ab283f94cab697173bc54d0fe918b1fd5af9e2 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Thu, 7 Jun 2012 14:15:30 +0100 Subject: [PATCH 2/3] Adjusting default ENABLED_SERVICES to include quantum --- stackrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stackrc b/stackrc index 3a19cdb023..6fcd02c03f 100644 --- a/stackrc +++ b/stackrc @@ -12,7 +12,12 @@ RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) # ENABLED_SERVICES, for example in your localrc to install all defaults but not # nova-volume you would just need to set this : # ENABLED_SERVICES+=,-n-vol -ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit +# ENABLED_SERVICES="$ENABLED_SERVICES,swift" +ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit,quantum,q-svc + +# Adam tinkering with options +RECLONE=yes +API_RATE_LIMIT=False # Set the default Nova APIs to enable NOVA_ENABLED_APIS=ec2,osapi_compute,osapi_volume,metadata From 7ccbac3d731e348b73d51e18f4b5fee25af63d2b Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Wed, 4 Jul 2012 11:25:42 +0100 Subject: [PATCH 3/3] applying killall dnsmasq patch --- stack.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index a171999759..42b187d595 100755 --- a/stack.sh +++ b/stack.sh @@ -1354,7 +1354,20 @@ fi if is_service_enabled n-net; then # Delete traces of nova networks from prior runs - sudo killall dnsmasq || true + + # Scraped patch from here: https://review.openstack.org/#/c/8730 + # Make sure you do not kill any dnsmasq instance spawn by NetworkManager + # in ubuntu precise dns is proxied through dnsmasq - if we kill that instance too + # we will lose dns resolution + netman_pid=$(pidof NetworkManager || true) + if [ -z "$netman_pid" ]; then + # kill every dnsmasq instance + sudo killall dnsmasq || true + else + # make sure only nova's dnsmasq instances are killed + sudo ps h -o pid,ppid -C dnsmasq | grep -v $netman_pid | awk '{print $1}' | sudo xargs kill || true + fi + clean_iptables rm -rf $NOVA_DIR/networks mkdir -p $NOVA_DIR/networks