Remove calls to service-create in devstack for now.
* The recommended backend for essex is the template backend.
* Fixes bug 950213
Change-Id: I2f8bc9f74cee2d783cbadcc1d4d4e674ddb905b9
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 958d2af..c9aa7d7 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -73,14 +73,7 @@
keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $INVIS_TENANT
-# Services
-keystone service-create --name=keystone \
- --type=identity \
- --description="Keystone Identity Service"
-
-keystone service-create --name=nova \
- --type=compute \
- --description="Nova Compute Service"
+# Configure service users/roles
NOVA_USER=$(get_id keystone user-create --name=nova \
--pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \
@@ -89,13 +82,6 @@
--user $NOVA_USER \
--role $ADMIN_ROLE
-keystone service-create --name=ec2 \
- --type=ec2 \
- --description="EC2 Compatibility Layer"
-
-keystone service-create --name=glance \
- --type=image \
- --description="Glance Image Service"
GLANCE_USER=$(get_id keystone user-create --name=glance \
--pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \
@@ -104,16 +90,7 @@
--user $GLANCE_USER \
--role $ADMIN_ROLE
-if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then
- keystone service-create --name="nova-volume" \
- --type=volume \
- --description="Nova Volume Service"
-fi
-
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
- keystone service-create --name=swift \
- --type="object-store" \
- --description="Swift Service"
SWIFT_USER=$(get_id keystone user-create --name=swift \
--pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \
@@ -124,9 +101,6 @@
fi
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
- keystone service-create --name=quantum \
- --type=network \
- --description="Quantum Service"
QUANTUM_USER=$(get_id keystone user-create --name=quantum \
--pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \