commit e5a5fe33e09bd4e2604f86a20b21e78dd7be09b2
author Jenkins <jenkins@review.openstack.org> Mon Jan 13 18:50:59 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 13 18:50:59 2014 +0000
tree c567cb35835ebefc7640b926363ee35ea79333e4
parent ab78dd5cb328c22c2b7dd44f286a2583366bef99
parent 4ad37630a2f938b19697f6e310def046a4dcca48

Merge "Remove duplicated name services"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 111b974..5397308 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -390,7 +390,7 @@
                 --adminurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \
                 --internalurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s"
             CINDER_V2_SERVICE=$(keystone service-create \
-                --name=cinder \
+                --name=cinderv2 \
                 --type=volumev2 \
                 --description="Cinder Volume Service V2" \
                 | grep " id " | get_field 2)

lib/nova

diff --git a/lib/nova b/lib/nova
index d308c1d..a508789 100644
--- a/lib/nova
+++ b/lib/nova
@@ -338,7 +338,7 @@
                 --adminurl "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \
                 --internalurl "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s"
             NOVA_V3_SERVICE=$(keystone service-create \
-                --name=nova \
+                --name=novav3 \
                 --type=computev3 \
                 --description="Nova Compute Service V3" \
                 | grep " id " | get_field 2)