summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_compute.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-03-12 17:46:46 -0400
committerDan Prince <dprince@redhat.com>2015-03-12 21:07:02 -0400
commitdc5d2373c6b6bb5859bcd2ee5f81249ab8ca7eee (patch)
tree71ebd78baa67659e2127a486c98fab234d459eae /puppet/manifests/overcloud_compute.pp
parentc392dffb9d55b5a0c9798f0152068ed8e5c7dd3b (diff)
puppet: tidy up the Nova ceilo auth configs
Updates the puppet configuration for the Ceilometer auth agent so that we do the join conversions in the Heat templates and use only hiera for configuration of the ::ceilometer::agent::auth class. Change-Id: I932afafe21b2485a0581ac3910ac9d46161eee0d
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
-rw-r--r--puppet/manifests/overcloud_compute.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cff0548f..740cd5a5 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -59,10 +59,7 @@ class { 'neutron::agents::ml2::ovs':
include ::ceilometer
include ::ceilometer::agent::compute
-
-class { 'ceilometer::agent::auth':
- auth_url => join(['http://', hiera('keystone_host'), ':5000/v2.0']),
-}
+include ::ceilometer::agent::auth
$snmpd_user = hiera('snmpd_readonly_user_name')
snmp::snmpv3_user { $snmpd_user: