commit 4ad37630a2f938b19697f6e310def046a4dcca48
author Juan Manuel Olle <juan.m.olle@intel.com> Mon Jan 06 15:07:09 2014 -0300
committer Juan Manuel Olle <juan.m.olle@intel.com> Mon Jan 06 15:25:31 2014 -0300
tree ba45c5d81d89ae8b07e42e433078910a5db97927
parent 0150d7eb2a160635a47a626f7c9968a8e0dc0254

Remove duplicated name services

Due to the fact that keystone will not allow services with
duplicated names, cinder and nova services names were
changed

Closes-Bug: #1259425
Change-Id: I988aef477b418a289426e02e5e108aa57dd1076b

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index cbe732e..a0b33c8 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -385,7 +385,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)