diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-23 16:09:14 -0400 |
|---|---|---|
| committer |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-07-11 11:00:36 -0400 |
| commit | 81863d101478ec0d74402cbe11127cbb39ce7d5b (patch) | |
| tree | 5cf85b91eba443ba65744cd9c5c15e56f03ac686 /overcloud-resource-registry-puppet.yaml | |
| parent | 800ee92b751ccdc8adc3375b765705f0c121f8d9 (diff) | |
Re-enable Ceilometer composable roles for controller
This patch brings back Ceilometer composable roles for controller,
module some adjustments to make it work.
Fixes 3 issues in Ceilometer composable services
1) This patch fixes the hiera maps in the pacemaker ceilometer*
templates. These were lists and should be a map.
2) fixes a critical issue in ceilometer-base.yaml where the
password was incorrectly coded in the YAML using get_param on
a string which wasn't actually a parameter.
3) Fixes the ceilometer_coordination_url so that it uses a YAML anchor
as was implied instead of get_param on a string which wasn't a
parameter.
4) Fixes the default database connection to use mongodb and configured
in puppet-tripleo profile appropriately.
Co-Authored-By: Dan Prince <dprince@redhat.com>
Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com>
Closes-Bug: #1601844
Change-Id: Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 591b0300..bc902a78 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -173,6 +173,11 @@ resource_registry: OS::TripleO::Services::SwiftStorage: puppet/services/swift-storage.yaml OS::TripleO::Services::Snmp: puppet/services/snmp.yaml OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml + OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml + OS::TripleO::Services::CeilometerCollector: puppet/services/ceilometer-collector.yaml + OS::TripleO::Services::CeilometerExpirer: puppet/services/ceilometer-expirer.yaml + OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml + OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml parameter_defaults: EnablePackageInstall: false |