diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-08 09:03:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-08 09:03:49 +0000 |
| commit | d82de68c774f152781633823394738520bf781a3 (patch) | |
| tree | 0aaaac52803aafd1f1965f19ed00541dbbbba3c8 | |
| parent | b7e1751fd1467274b0c2093b60a15ce1ea606b6b (diff) | |
| parent | 03b917710e5ff4f3f2f650688c750ee9628751f3 (diff) | |
Merge "puppet: allow to configure any ceilometer param with Hiera"
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 80543813..a0ef701a 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -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 diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index d317928b..c857c5c5 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -431,6 +431,7 @@ if hiera('step') >= 3 { } } include ::ceilometer + include ::ceilometer::config include ::ceilometer::api include ::ceilometer::agent::notification include ::ceilometer::agent::central diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 496f20e3..5c220dc5 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -814,6 +814,7 @@ if hiera('step') >= 3 { } } include ::ceilometer + include ::ceilometer::config class { '::ceilometer::api' : manage_service => false, enabled => false, |