Remove deprecated node_ips hiera keys

This aligns with the new naming conventions in puppet-tripleo, so
the keys can be more easily generated from the service_names.

Change-Id: Idb4a740e70257e3c69d8ec7d0c88594cc091b6a7
Partially-Implements: blueprint custom-roles
Depends-On: I423b544df174254ac511b906b0c570e701678022

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 6f13b74..f1ce42b 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -104,14 +104,6 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
-                rabbit_node_ips:
-                  str_replace:
-                    template: "['SERVERS_LIST']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "','"
-                        - {get_param: rabbit_node_ips}
                 rabbitmq_node_ips: &rabbit_nodes_array
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -128,14 +120,6 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: mongo_node_ips}
-                mongo_node_ips:
-                  str_replace:
-                    template: "['SERVERS_LIST']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "','"
-                        - {get_param: mongo_node_ips}
                 redis_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -160,22 +144,6 @@ resources:
                         list_join:
                         - "]','inet6:["
                         - {get_param: memcache_node_ips}
-                memcache_node_ips:
-                  str_replace:
-                    template: "['SERVERS_LIST']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "','"
-                        - {get_param: memcache_node_ips}
-                memcache_node_ips_v6:
-                  str_replace:
-                    template: "['inet6:[SERVERS_LIST]']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "]','inet6:["
-                        - {get_param: memcache_node_ips}
                 mysql_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"