-# FIXME: Might be better to use 'service' tenant here but this requires
-# changes in the tripleo-incubator keystone role setup
-ceilometer::agent::auth::auth_tenant_name: 'admin'
+ceilometer::agent::auth::auth_tenant_name: 'service'
+
+aodh::auth::auth_region: 'regionOne'
+aodh::auth::auth_tenant_name: 'service'