diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-06-30 07:29:04 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-30 07:29:04 -0400 |
| commit | 4a7a0d8879d94bacd985b7295210ac0480ea9a71 (patch) | |
| tree | 954fea15d496b4f9e0fff00935347924f78d5e13 /manifests | |
| parent | ae821d82bc5031998c1d5c4b07094d603cb8b208 (diff) | |
Resolve duplicate base::ceilometer issues
We are seeing CI failures in Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
due to duplicate Tripleo::Profile::Base::Ceilometer.
Also, this patch gets the pacemaker_master variable out of the
'base' tree.
Change-Id: I2cf3362528235fcdeaef1491f86c05f4995938da
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/ceilometer.pp | 12 | ||||
| -rw-r--r-- | manifests/profile/base/ceilometer/collector.pp | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp index a7d62ce..97e1bb8 100644 --- a/manifests/profile/base/ceilometer.pp +++ b/manifests/profile/base/ceilometer.pp @@ -23,18 +23,16 @@ # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The master node runs some tasks -# one step earlier than others; disable to -# the node is not the master. +# [*sync_db*] +# (Optional) Whether to run db sync # Defaults to true - +# class tripleo::profile::base::ceilometer ( $step = hiera('step'), - $pacemaker_master = true, + $sync_db = true, ) { - if $step >= 4 or ($step >= 3 and $pacemaker_master) { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::ceilometer include ::ceilometer::db include ::ceilometer::config diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 6891f9c..34ee90b 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector ( $sync_db = true, ) { - class { '::tripleo::profile::base::ceilometer': - pacemaker_master => $sync_db, - } + include ::tripleo::profile::base::ceilometer if $step >= 3 and $sync_db { $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb')) |