diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-18 20:15:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-18 20:15:27 +0000 |
| commit | 882ee42f4a35010259c6f2bec1847946e76f3718 (patch) | |
| tree | 201977adf0965036e1764596a558b3d895bd4879 /puppet/controller-puppet.yaml | |
| parent | f74890a8dc270d035fe111c203a412b076f56033 (diff) | |
| parent | d02beabc0af6b4843f7b4bbd759f1ba4252562b8 (diff) | |
Merge "Enable loadbalancing of the Redis VIP, defaults to False"
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index a38a0a3c..953e592f 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -691,6 +691,12 @@ resources: ceilometer_backend: {get_param: CeilometerBackend} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} + ceilometer_coordination_url: + list_join: + - '' + - - 'redis://' + - {get_param: RedisVirtualIP} + - ':6379' ceilometer_dsn: list_join: - '' @@ -949,6 +955,7 @@ resources: ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri} ceilometer::agent::auth::auth_password: {get_input: ceilometer_password} ceilometer::agent::auth::auth_url: {get_input: keystone_auth_address} + ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url} snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} |