Restore admin role to ceilometer user.
Fixes bug 1193004
The ceilometer user needs the admin role, so that the resources
(instances etc.) associated with all tenants are visible to the
ceilometer agents for metering purposes.
Change-Id: I4d8a88d2d88a11a4b408e0c68ef227ec2af2d822
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index a1875e1..ccac880 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -7,7 +7,7 @@
# service glance admin
# service swift service # if enabled
# service heat service # if enabled
-# service ceilometer service # if enabled
+# service ceilometer admin # if enabled
# Tempest Only:
# alt_demo alt_demo Member
#
@@ -157,7 +157,7 @@
--email=ceilometer@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \
--user_id $CEILOMETER_USER \
- --role_id $SERVICE_ROLE
+ --role_id $ADMIN_ROLE
# Ceilometer needs ResellerAdmin role to access swift account stats.
keystone user-role-add --tenant_id $SERVICE_TENANT \
--user_id $CEILOMETER_USER \