diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-28 12:39:16 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-03 19:45:11 +0000 |
| commit | 24c596468baa7a9f306bbe42880348a25e10c788 (patch) | |
| tree | 0b3dc588601762c72f1f0bcd05ad04f7150a8b27 | |
| parent | 51258bc6bb87c5f434b286d3f843587c821a69de (diff) | |
Remove hard-coded per-service rabbitmq hieradata
To avoid the hard-coded references which won't work with
composable roles, we instead default to the rabbitmq_node_ips
list in the per-service puppet-tripleo profiles.
Change-Id: I76b7e06781fdd5d969503b6d73423bb3f5f7a41f
Depends-On: Ie53c93456529420588eb1927703ea91b54095d87
Partially-Implements: blueprint custom-roles
| -rw-r--r-- | overcloud.yaml | 1 | ||||
| -rw-r--r-- | puppet/all-nodes-config.yaml | 23 |
2 files changed, 0 insertions, 24 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index bcba079e..d286e7dd 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -630,7 +630,6 @@ resources: service_ips: {get_attr: [ControllerIpListMap, service_ips]} service_node_names: {get_attr: [ControllerIpListMap, service_hostnames]} # FIXME(shardy): These require further work to move into service_ips - rabbit_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, RabbitmqNetwork]}]} memcache_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MemcachedNetwork]}]} keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]} keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]} diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 17b72d4b..3b966985 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -16,8 +16,6 @@ parameters: 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: @@ -85,14 +83,6 @@ resources: 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]']" @@ -117,19 +107,6 @@ resources: list_join: - "','" - {get_param: keystone_admin_api_node_ips} - # 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} |