summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-02 08:48:31 +0000
committerGerrit Code Review <review@openstack.org>2016-03-02 08:48:31 +0000
commit5ffbfed01d89d048fc64f241bce1b0224da05f3f (patch)
tree2fb29b263ffaae972a1f23ce2e027911124accda /puppet
parent0ed6bb6be8e733558a5338782d704f2b3a935971 (diff)
parent0d47b4d27f2f114fae6d88fd9efaf9fb28f6e052 (diff)
Merge "Use service tenant for ceilometer"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/common.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 03366c7e..7a5e54d8 100644
--- 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'