Align node_ips hiera keys with the service name.

To enable composable generation of this switch the key names
to align with the service_name of each service.

Note that this should depend on I423b544df174254ac511b906b0c570e701678022
and previously passed CI with that defined, but because we now run
gate validation jobs on puppet-tripleo it's impossible to land, so
this now contains both old and new hiera keys temporarily, which will
be removed when the puppet-tripleo patch lands.

Change-Id: I7febf28bf409e25e8e5961ab551b6d56bb11e0c6
Partially-Implements: blueprint custom-roles

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 793b17d..6f13b74 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -104,7 +104,7 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
-                rabbit_node_ips: &rabbit_nodes_array
+                rabbit_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -112,6 +112,22 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: rabbit_node_ips}
+                rabbitmq_node_ips: &rabbit_nodes_array
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: rabbit_node_ips}
+                mongodb_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: mongo_node_ips}
                 mongo_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -128,6 +144,22 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: redis_node_ips}
+                memcached_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: memcache_node_ips}
+                memcached_node_ips_v6:
+                  str_replace:
+                    template: "['inet6:[SERVERS_LIST]']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "]','inet6:["
+                        - {get_param: memcache_node_ips}
                 memcache_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"