X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fall-nodes-config.yaml;h=963835e903318d0ac3121b9217862ad90351cb9a;hb=eaa5eb6a5985c52b484d58e22075b84caf2f2493;hp=55acb4b7f6c28ed72645a90cd97b1f4b844d76ad;hpb=2f5d1a609e9863beff19d021dae184aecbe75e2c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 55acb4b7..963835e9 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'All Nodes Config for Puppet'
 
 parameters:
@@ -42,22 +42,49 @@ resources:
             - list_join:
               - "\n"
               - {get_param: ceph_storage_hosts}
-        sysctl:
-          net.ipv4.tcp_keepalive_time: 5
-          net.ipv4.tcp_keepalive_probes: 5
-          net.ipv4.tcp_keepalive_intvl: 1
         hiera:
           datafiles:
             all_nodes:
               mapped_data:
-                rabbit_node_names:
+                controller_node_ips:
+                  list_join:
+                  - ','
+                  - {get_param: controller_ips}
+                controller_node_names:
+                  list_join:
+                  - ','
+                  - {get_param: controller_names}
+                galera_node_names:
                   list_join:
                   - ','
                   - {get_param: controller_names}
+                rabbit_node_ips: &rabbit_nodes_array
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: controller_ips}
                 mongo_node_ips:
                   list_join:
                   - ','
                   - {get_param: controller_ips}
+                redis_node_ips:
+                  list_join:
+                  - ','
+                  - {get_param: controller_ips}
+                memcache_node_ips:
+                  list_join:
+                  - ','
+                  - {get_param: controller_ips}
+                # NOTE(gfidente): interpolation with %{} in the
+                # hieradata file can't be used as it returns string
+                ceilometer::rabbit_hosts: *rabbit_nodes_array
+                cinder::rabbit_hosts: *rabbit_nodes_array
+                heat::rabbit_hosts: *rabbit_nodes_array
+                neutron::rabbit_hosts: *rabbit_nodes_array
+                nova::rabbit_hosts: *rabbit_nodes_array
 
 outputs:
   config_id: