From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 2 Mar 2016 08:48:31 +0000 (+0000)
Subject: Merge "Use service tenant for ceilometer"
X-Git-Tag: opnfv-6.0.0~2147
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5ffbfed01d89d048fc64f241bce1b0224da05f3f;p=apex-tripleo-heat-templates.git

Merge "Use service tenant for ceilometer"
---

5ffbfed01d89d048fc64f241bce1b0224da05f3f
diff --cc puppet/hieradata/common.yaml
index 03366c7e,cc20dae0..7a5e54d8
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@@ -3,13 -3,11 +3,11 @@@ ssh::server::storeconfigs_enabled: fals
  
  # 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_admin_tenant_name: 'service'
 -nova::network::neutron::neutron_admin_username: 'neutron'
 +nova::network::neutron::neutron_project_name: 'service'
 +nova::network::neutron::neutron_username: 'neutron'
  nova::network::neutron::dhcp_domain: ''
  
  neutron::allow_overlapping_ips: true