commit f33e76bf9bd9a3bc39e8b3b99257a4ae98a10d25
author Jenkins <jenkins@review.openstack.org> Tue Oct 07 03:51:05 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Oct 07 03:51:05 2014 +0000
tree b6179a6cdd53ee0e3517c0193e055043a453f01d
parent 690e3c25742f47fd2a42d6407ffa30bc99288dc0
parent 3feaa383ce07c1cf0f5c8760e326aab96b55ddbf

Merge "Add Nova v2.1 API endpoint"

files/default_catalog.templates

diff --git a/files/default_catalog.templates b/files/default_catalog.templates
index 9016355..a18d38f 100644
--- a/files/default_catalog.templates
+++ b/files/default_catalog.templates
@@ -12,6 +12,12 @@
 catalog.RegionOne.compute.name = Compute Service
 
 
+catalog.RegionOne.computev21.publicURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s
+catalog.RegionOne.computev21.adminURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s
+catalog.RegionOne.computev21.internalURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s
+catalog.RegionOne.computev21.name = Compute Service V2.1
+
+
 catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
 catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
 catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s

lib/nova

diff --git a/lib/nova b/lib/nova
index 096d380..fa57432 100644
--- a/lib/nova
+++ b/lib/nova
@@ -358,6 +358,14 @@
                 "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \
                 "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \
                 "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s"
+
+            local nova_v21_service=$(get_or_create_service "novav21" \
+                "computev21" "Nova Compute Service V2.1")
+            get_or_create_endpoint $nova_v21_service \
+                "$REGION_NAME" \
+                "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2.1/\$(tenant_id)s" \
+                "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2.1/\$(tenant_id)s" \
+                "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2.1/\$(tenant_id)s"
         fi
     fi