diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-03 20:40:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-03 20:40:03 +0000 |
| commit | 6be32543479589dedcae7502e6fe2167efeda710 (patch) | |
| tree | aac8c0b8b2b5899c9432dbec50d292bc820c4c18 /puppet/all-nodes-config.yaml | |
| parent | 3986128c283227b8eb16d1ff1776175e6de12c54 (diff) | |
| parent | f72aed85594f223b6f888e6d0af3c880ea581a66 (diff) | |
Merge "Deploy Aodh services, replacing Ceilometer Alarm"
Diffstat (limited to 'puppet/all-nodes-config.yaml')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index e85975d4..f7633a86 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -34,6 +34,8 @@ parameters: type: comma_delimited_list ceilometer_api_node_ips: type: comma_delimited_list + aodh_api_node_ips: + type: comma_delimited_list nova_api_node_ips: type: comma_delimited_list nova_metadata_node_ips: @@ -179,6 +181,14 @@ resources: list_join: - "','" - {get_param: ceilometer_api_node_ips} + aodh_api_node_ips: + str_replace: + template: "['SERVERS_LIST']" + params: + SERVERS_LIST: + list_join: + - "','" + - {get_param: aodh_api_node_ips} nova_api_node_ips: str_replace: template: "['SERVERS_LIST']" @@ -264,6 +274,7 @@ resources: # NOTE(gfidente): interpolation with %{} in the # hieradata file can't be used as it returns string ceilometer::rabbit_hosts: *rabbit_nodes_array + aodh::rabbit_hosts: *rabbit_nodes_array cinder::rabbit_hosts: *rabbit_nodes_array heat::rabbit_hosts: *rabbit_nodes_array neutron::rabbit_hosts: *rabbit_nodes_array |