Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Specify the Ceph packages to be installed"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceilometer-agent-central.yaml
diff --git
a/puppet/services/ceilometer-agent-central.yaml
b/puppet/services/ceilometer-agent-central.yaml
index
07f0b49
..
c4abc30
100644
(file)
--- a/
puppet/services/ceilometer-agent-central.yaml
+++ b/
puppet/services/ceilometer-agent-central.yaml
@@
-51,14
+51,6
@@
outputs:
config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- - ceilometer::agent::central::coordination_url:
- list_join:
- - ''
- - - 'redis://:'
- - {get_param: RedisPassword}
- - '@'
- - "%{hiera('redis_vip')}"
- - ':6379/'
- ceilometer_redis_password: {get_param: RedisPassword}
+ - ceilometer_redis_password: {get_param: RedisPassword}
step_config: |
include ::tripleo::profile::base::ceilometer::agent::central
step_config: |
include ::tripleo::profile::base::ceilometer::agent::central