Merge "Configure ControllerServices via resource chains"

[apex-tripleo-heat-templates.git] / puppet / bootstrap-config.yaml

diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml
index 29b7af7..d88eebd 100644 (file)
--- a/puppet/bootstrap-config.yaml
+++ b/puppet/bootstrap-config.yaml
@@ -1,21 +1,25 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Bootstrap Config Puppet'
 
 parameters:
   bootstrap_nodeid:
     type: string
+  bootstrap_nodeid_ip:
+    type: string
 
 resources:
 
   BootstrapNodeConfigImpl:
     type: OS::Heat::StructuredConfig
     properties:
+      group: os-apply-config
       config:
         hiera:
           datafiles:
             bootstrap_node:
               mapped_data:
                 bootstrap_nodeid: {get_param: bootstrap_nodeid}
+                bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip}
 
 outputs:
   config_id: