Remove hard-coded per-service rabbitmq hieradata

[apex-tripleo-heat-templates.git] / puppet / all-nodes-config.yaml

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index a43e964..3b96698 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -12,18 +12,16 @@ parameters:
     type: comma_delimited_list
   service_ips:
     type: json
+  service_node_names:
+    type: json
   controller_names:
     type: comma_delimited_list
-  rabbit_node_ips:
-    type: comma_delimited_list
   memcache_node_ips:
     type: comma_delimited_list
   keystone_public_api_node_ips:
     type: comma_delimited_list
   keystone_admin_api_node_ips:
     type: comma_delimited_list
-  ceph_mon_node_names:
-    type: comma_delimited_list
   DeployIdentifier:
     type: string
     description: >
@@ -76,6 +74,7 @@ resources:
                             str_split: [',', {get_param: enabled_services}]
                   # provides a mapping of service_name_ips to a list of IPs
                   - {get_param: service_ips}
+                  - {get_param: service_node_names}
                   - controller_node_ips:
                       list_join:
                       - ','
@@ -84,18 +83,6 @@ resources:
                       list_join:
                       - ','
                       - {get_param: controller_names}
-                    galera_node_names:
-                      list_join:
-                      - ','
-                      - {get_param: controller_names}
-                    rabbitmq_node_ips: &rabbit_nodes_array
-                      str_replace:
-                        template: "['SERVERS_LIST']"
-                        params:
-                          SERVERS_LIST:
-                            list_join:
-                            - "','"
-                            - {get_param: rabbit_node_ips}
                     memcached_node_ips_v6:
                       str_replace:
                         template: "['inet6:[SERVERS_LIST]']"
@@ -120,23 +107,6 @@ resources:
                             list_join:
                             - "','"
                             - {get_param: keystone_admin_api_node_ips}
-                    tripleo::profile::base::ceph::ceph_mon_initial_members:
-                      list_join:
-                      - ','
-                      - {get_param: ceph_mon_node_names}
-                    # 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
-                    glance::notify::rabbitmq::rabbit_hosts: *rabbit_nodes_array
-                    manila::rabbit_hosts: *rabbit_nodes_array
-                    heat::rabbit_hosts: *rabbit_nodes_array
-                    neutron::rabbit_hosts: *rabbit_nodes_array
-                    nova::rabbit_hosts: *rabbit_nodes_array
-                    keystone::rabbit_hosts: *rabbit_nodes_array
-                    sahara::rabbit_hosts: *rabbit_nodes_array
-                    ironic::rabbit_hosts: *rabbit_nodes_array
 
                     deploy_identifier: {get_param: DeployIdentifier}
                     update_identifier: {get_param: UpdateIdentifier}