X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fall-nodes-config.yaml;h=ddde54982fe6344e2f6453c7c65e89f569f020cc;hb=d7fe85b77e17767a21348a711da41b658a4ab1c5;hp=6f13b74ecaa9980bcb2468799f8507401a0285d8;hpb=0b2829480a299dcba6d5471a99ed76fb92ca31a6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 6f13b74e..ddde5498 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -56,6 +56,8 @@ parameters:
     type: comma_delimited_list
   ceph_mon_node_names:
     type: comma_delimited_list
+  opendaylight_api_node_ips:
+    type: comma_delimited_list
   DeployIdentifier:
     type: string
     description: >
@@ -104,14 +106,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 +122,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 +146,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']"
@@ -329,7 +299,14 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: ironic_api_node_ips}
-
+                opendaylight_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: opendaylight_api_node_ips}
                 tripleo::profile::base::ceph::ceph_mon_initial_members:
                   list_join:
                   - ','