From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 8 Oct 2015 09:03:49 +0000 (+0000)
Subject: Merge "puppet: allow to configure any ceilometer param with Hiera"
X-Git-Tag: opnfv-6.0.0~2364
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d82de68c774f152781633823394738520bf781a3;p=apex-tripleo-heat-templates.git

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

d82de68c774f152781633823394738520bf781a3
diff --cc puppet/manifests/overcloud_compute.pp
index 80543813,9acc18fe..a0ef701a
--- a/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