openstack
/
puppet-tripleo
Code Issues Proposed changes

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
This commit is contained in:
Dan Prince 2016-06-30 07:29:04 -04:00
parent ae821d82bc
commit 4a7a0d8879
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/profile/base/ceilometer.pp
View File

@ -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

4
manifests/profile/base/ceilometer/collector.pp
View File

@ -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'))