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 /puppet/services/ceilometer-api.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 'puppet/services/ceilometer-api.yaml')
| -rw-r--r-- | puppet/services/ceilometer-api.yaml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml new file mode 100644 index 00000000..06c2ed12 --- /dev/null +++ b/puppet/services/ceilometer-api.yaml @@ -0,0 +1,27 @@ +heat_template_version: 2016-04-08 + +description: > + OpenStack Ceilometer API service configured with Puppet + +parameters: + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + + +resources: + CeilometerServiceBase: + type: ./ceilometer-base.yaml + properties: + EndpointMap: {get_param: EndpointMap} + +outputs: + role_data: + description: Role data for the Ceilometer API role. + value: + config_settings: + get_attr: [CeilometerServiceBase, role_data, config_settings] + step_config: | + include ::tripleo::profile::base::ceilometer::api |