X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fall-nodes-config.yaml;h=b703d5cba4efa0444f5e55e9e97432561cdbbdb1;hb=b56c2f01bdc32d407dc6b981abf30465ddd0b9f8;hp=7fca449ea73422fe885d1c58580e147078fcb9fa;hpb=431b65a32fd0880bb14ddaf07e2f53ac42f10dad;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 7fca449e..b703d5cb 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:
@@ -6,6 +6,8 @@ parameters:
     type: comma_delimited_list
   controller_hosts:
     type: comma_delimited_list
+  controller_ips:
+    type: comma_delimited_list
   block_storage_hosts:
     type: comma_delimited_list
   object_storage_hosts:
@@ -48,10 +50,34 @@ resources:
           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:
+                  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}
 
 outputs:
   config_id: