Resolve duplicate base::ceilometer issues
authorDan Prince <dprince@redhat.com>
Thu, 30 Jun 2016 11:29:04 +0000 (07:29 -0400)
committerDan Prince <dprince@redhat.com>
Thu, 30 Jun 2016 11:29:04 +0000 (07:29 -0400)
commit4a7a0d8879d94bacd985b7295210ac0480ea9a71
tree954fea15d496b4f9e0fff00935347924f78d5e13
parentae821d82bc5031998c1d5c4b07094d603cb8b208
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
manifests/profile/base/ceilometer.pp
manifests/profile/base/ceilometer/collector.pp