diff options
author | James Slagle <jslagle@redhat.com> | 2016-03-04 15:03:45 -0500 |
---|---|---|
committer | James Slagle <jslagle@redhat.com> | 2016-03-04 23:05:35 -0500 |
commit | 8da8b84560fc7fcc4c332c03f4242946a18955e9 (patch) | |
tree | 7020015b52f8d412b99241a8e04a150acfe65618 /puppet/all-nodes-config.yaml | |
parent | 00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (diff) |
Revert "Deploy Aodh services, replacing Ceilometer Alarm"
This just a revert to see if reverting this gets back to a normal CI run time.
This reverts commit f72aed85594f223b6f888e6d0af3c880ea581a66.
Change-Id: I04a0893f6cf69f547a4db26261005e580e1fc90b
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 |