Revert "Deploy Aodh services, replacing Ceilometer Alarm"

[apex-tripleo-heat-templates.git] / puppet / hieradata / common.yaml

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 03366c7..7a5e54d 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -3,9 +3,7 @@ ssh::server::storeconfigs_enabled: false
 
 # ceilometer settings used by compute and controller ceilo auth settings
 ceilometer::agent::auth::auth_region: 'regionOne'
-# 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'
 
 nova::api::admin_tenant_name: 'service'
 nova::network::neutron::neutron_project_name: 'service'