diff options
Diffstat (limited to 'puppet/services/ceilometer-collector.yaml')
| -rw-r--r-- | puppet/services/ceilometer-collector.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml index 111b3e8b..8e85ae3f 100644 --- a/puppet/services/ceilometer-collector.yaml +++ b/puppet/services/ceilometer-collector.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack Ceilometer Collector service configured with Puppet @@ -90,15 +90,15 @@ outputs: - get_attr: [MongoDbBase, role_data, config_settings] - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer::db::database_connection: - list_join: - - '' - - - {get_param: [EndpointMap, MysqlInternal, protocol]} - - - '://ceilometer:' - - {get_param: CeilometerPassword} - - '@' - - {get_param: [EndpointMap, MysqlInternal, host]} - - '/ceilometer' - - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + make_url: + scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} + username: ceilometer + password: {get_param: CeilometerPassword} + host: {get_param: [EndpointMap, MysqlInternal, host]} + path: /ceilometer + query: + read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo ceilometer_backend: {get_param: CeilometerBackend} ceilometer::event_time_to_live: {get_param: CeilometerEventTTL} ceilometer::metering_time_to_live: {get_param: CeilometerMeteringTTL} |