@@ -390,7 +390,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)

@@ -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)