From 4ad37630a2f938b19697f6e310def046a4dcca48 Mon Sep 17 00:00:00 2001 From: Juan Manuel Olle Date: Mon, 6 Jan 2014 15:07:09 -0300 Subject: [PATCH] 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 | 2 +- lib/nova | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cinder b/lib/cinder index cbe732e9b0..a0b33c8c88 100644 --- a/lib/cinder +++ b/lib/cinder @@ -385,7 +385,7 @@ create_cinder_accounts() { --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) diff --git a/lib/nova b/lib/nova index e754341bad..e9f87fce1f 100644 --- a/lib/nova +++ b/lib/nova @@ -338,7 +338,7 @@ create_nova_accounts() { --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)