openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "puppet: allow to configure any ceilometer param with Hiera"

This commit is contained in:
Jenkins 2015-10-08 09:03:49 +00:00 committed by Gerrit Code Review
parent b7e1751fd1 03b917710e
commit d82de68c77
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/manifests/overcloud_compute.pp
View File

@ -87,6 +87,7 @@ if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
include ::ceilometer
include ::ceilometer::config
include ::ceilometer::agent::compute
include ::ceilometer::agent::auth

1
puppet/manifests/overcloud_controller.pp
View File

@ -431,6 +431,7 @@ if hiera('step') >= 3 {
}
}
include ::ceilometer
include ::ceilometer::config
include ::ceilometer::api
include ::ceilometer::agent::notification
include ::ceilometer::agent::central

1
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -814,6 +814,7 @@ if hiera('step') >= 3 {
}
}
include ::ceilometer
include ::ceilometer::config
class { '::ceilometer::api' :
manage_service => false,
enabled => false,