Move cinder account creation out of keystone_data.sh
Supports the coming HA/proxy configuration for Cinder
Change-Id: If2e08e45430dce895ed6bb1070612517a38ca4bc
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 17e8c59..71a8e5e 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -7,7 +7,6 @@
# service glance admin
# service quantum admin # if enabled
# service swift admin # if enabled
-# service cinder admin # if enabled
# service heat admin # if enabled
# service ceilometer admin # if enabled
# Tempest Only:
@@ -38,6 +37,7 @@
# Lookups
SERVICE_TENANT=$(keystone tenant-list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
ADMIN_ROLE=$(keystone role-list | awk "/ admin / { print \$2 }")
+MEMBER_ROLE=$(keystone role-list | awk "/ Member / { print \$2 }")
# Roles
@@ -49,6 +49,7 @@
# role is also configurable in swift-proxy.conf
RESELLER_ROLE=$(get_id keystone role-create --name=ResellerAdmin)
+
# Services
# --------
@@ -243,25 +244,3 @@
--user_id $ALT_DEMO_USER \
--role_id $MEMBER_ROLE
fi
-
-if [[ "$ENABLED_SERVICES" =~ "c-api" ]]; then
- CINDER_USER=$(get_id keystone user-create --name=cinder \
- --pass="$SERVICE_PASSWORD" \
- --tenant_id $SERVICE_TENANT \
- --email=cinder@example.com)
- keystone user-role-add --tenant_id $SERVICE_TENANT \
- --user_id $CINDER_USER \
- --role_id $ADMIN_ROLE
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
- CINDER_SERVICE=$(get_id keystone service-create \
- --name=cinder \
- --type=volume \
- --description="Cinder Service")
- keystone endpoint-create \
- --region RegionOne \
- --service_id $CINDER_SERVICE \
- --publicurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s" \
- --adminurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s" \
- --internalurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s"
- fi
-fi