ERRORs in ceilometer-acentral log after succesful tempest run
recent merge added duplicate creation of ceilometer user. remove
ceilometer user creation from keystone_data so we can correctly add
ResellerAdmin role to ceilometer user which it needs to interact
with swift
Change-Id: I043c6b9337dfb147c3c8f364b462708a4030b41c
Closes-Bug: #1268730
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 07b6b60..d477c42 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -6,7 +6,6 @@
# ------------------------------------------------------------------
# service glance admin
# service heat service # if enabled
-# service ceilometer admin # if enabled
# Tempest Only:
# alt_demo alt_demo Member
#
@@ -113,30 +112,11 @@
fi
# Ceilometer
-if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then
- keystone user-create --name=ceilometer \
- --pass="$SERVICE_PASSWORD" \
- --tenant $SERVICE_TENANT_NAME \
- --email=ceilometer@example.com
- keystone user-role-add --tenant $SERVICE_TENANT_NAME \
- --user ceilometer \
- --role admin
+if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]] && [[ "$ENABLED_SERVICES" =~ "s-proxy" || "$ENABLED_SERVICES" =~ "swift" ]]; then
# Ceilometer needs ResellerAdmin role to access swift account stats.
keystone user-role-add --tenant $SERVICE_TENANT_NAME \
--user ceilometer \
--role ResellerAdmin
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
- keystone service-create \
- --name=ceilometer \
- --type=metering \
- --description="Ceilometer Service"
- keystone endpoint-create \
- --region RegionOne \
- --service ceilometer \
- --publicurl "http://$SERVICE_HOST:8777" \
- --adminurl "http://$SERVICE_HOST:8777" \
- --internalurl "http://$SERVICE_HOST:8777"
- fi
fi
# EC2