diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 14:31:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 14:31:00 +0000 |
| commit | 582a3115f744af151f4cd36a5ad0ac3e8ef09a7f (patch) | |
| tree | 0ae48cef435d7c2830d687b25d9c5b4e1146b0f6 /puppet/all-nodes-config.yaml | |
| parent | 55fb175bed3a020bbc5cb1c41235f0893ac43cc4 (diff) | |
| parent | 8da8b84560fc7fcc4c332c03f4242946a18955e9 (diff) | |
Merge "Revert "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, 0 insertions, 11 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index f7633a86..e85975d4 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -34,8 +34,6 @@ 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: @@ -181,14 +179,6 @@ 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']" @@ -274,7 +264,6 @@ 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 |