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

diff --cc puppet/manifests/overcloud_compute.pp
index 8054381,9acc18f..a0ef701
--- 1/puppet/manifests/overcloud_compute.pp
--- 2/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@@ -78,15 -78,8 +78,16 @@@ class { 'neutron::agents::ml2::ovs'
    tunnel_types    => split(hiera('neutron_tunnel_types'), ','),
  }
  
 +if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
 +  class { 'neutron::agents::n1kv_vem':
 +    n1kv_source          => hiera('n1kv_vem_source', undef),
 +    n1kv_version         => hiera('n1kv_vem_version', undef),
 +  }
 +}
 +
 +
  include ::ceilometer
+ include ::ceilometer::config
  include ::ceilometer::agent::compute
  include ::ceilometer::agent::auth
  

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge