X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fall-nodes-config.yaml;h=963835e903318d0ac3121b9217862ad90351cb9a;hb=8072ae85082dd060d1cb8e3bcba76da8372ed593;hp=9345e5c5d92f062d606c7b3943e9ab141e4164ff;hpb=ad0f3a3e44adad1bd8aaaa580197e3c68f327388;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 9345e5c5..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,10 +42,6 @@ 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:
@@ -54,10 +50,22 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_ips}
-                rabbit_node_ips:
+                controller_node_names:
                   list_join:
                   - ','
-                  - {get_param: controller_ips}
+                  - {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:
                   - ','
@@ -66,6 +74,17 @@ resources:
                   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: