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

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 4c9355d5..ddde5498 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -2,18 +2,10 @@ heat_template_version: 2015-04-30
 description: 'All Nodes Config for Puppet'
 
 parameters:
-  compute_hosts:
-    type: comma_delimited_list
-  controller_hosts:
+  hosts:
     type: comma_delimited_list
   controller_ips:
     type: comma_delimited_list
-  block_storage_hosts:
-    type: comma_delimited_list
-  object_storage_hosts:
-    type: comma_delimited_list
-  ceph_storage_hosts:
-    type: comma_delimited_list
   controller_names:
     type: comma_delimited_list
   rabbit_node_ips:
@@ -64,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: >
@@ -91,21 +85,7 @@ resources:
         hosts:
           list_join:
           - "\n"
-          - - list_join:
-              - "\n"
-              - {get_param: compute_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: controller_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: block_storage_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: object_storage_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: ceph_storage_hosts}
+          - {get_param: hosts}
         hiera:
           datafiles:
             bootstrap_node:
@@ -126,7 +106,7 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
-                rabbit_node_ips: &rabbit_nodes_array
+                rabbitmq_node_ips: &rabbit_nodes_array
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -134,7 +114,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: rabbit_node_ips}
-                mongo_node_ips:
+                mongodb_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -150,7 +130,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: redis_node_ips}
-                memcache_node_ips:
+                memcached_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -158,7 +138,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: memcache_node_ips}
-                memcache_node_ips_v6:
+                memcached_node_ips_v6:
                   str_replace:
                     template: "['inet6:[SERVERS_LIST]']"
                     params:
@@ -319,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:
                   - ','