Browse code

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

Eoghan Glynn authored on 2013/06/21 00:05:54
Showing 1 changed files
... ...
@@ -7,7 +7,7 @@
7 7
 # service              glance     admin
8 8
 # service              swift      service        # if enabled
9 9
 # service              heat       service        # if enabled
10
-# service              ceilometer service        # if enabled
10
+# service              ceilometer admin          # if enabled
11 11
 # Tempest Only:
12 12
 # alt_demo             alt_demo  Member
13 13
 #
... ...
@@ -157,7 +157,7 @@ if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then
157 157
                                               --email=ceilometer@example.com)
158 158
     keystone user-role-add --tenant_id $SERVICE_TENANT \
159 159
                            --user_id $CEILOMETER_USER \
160
-                           --role_id $SERVICE_ROLE
160
+                           --role_id $ADMIN_ROLE
161 161
     # Ceilometer needs ResellerAdmin role to access swift account stats.
162 162
     keystone user-role-add --tenant_id $SERVICE_TENANT \
163 163
                            --user_id $CEILOMETER_USER \