aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/bootstrap-config.yaml24
-rw-r--r--puppet/controller-puppet.yaml3
2 files changed, 25 insertions, 2 deletions
diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml
new file mode 100644
index 00000000..29b7af7d
--- /dev/null
+++ b/puppet/bootstrap-config.yaml
@@ -0,0 +1,24 @@
+heat_template_version: 2014-10-16
+description: 'Bootstrap Config Puppet'
+
+parameters:
+ bootstrap_nodeid:
+ type: string
+
+resources:
+
+ BootstrapNodeConfigImpl:
+ type: OS::Heat::StructuredConfig
+ properties:
+ config:
+ hiera:
+ datafiles:
+ bootstrap_node:
+ mapped_data:
+ bootstrap_nodeid: {get_param: bootstrap_nodeid}
+
+outputs:
+ config_id:
+ description: The ID of the BootstrapNodeConfigImpl resource.
+ value:
+ {get_resource: BootstrapNodeConfigImpl}
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index a3a422c1..e24a6666 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -556,6 +556,7 @@ resources:
- object
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- rabbit # provided by allNodesConfig
+ - bootstrap_node # provided by BootstrapNodeConfig
- common
datafiles:
common:
@@ -564,8 +565,6 @@ resources:
raw_data: {get_file: hieradata/object.yaml}
controller:
raw_data: {get_file: hieradata/controller.yaml}
- oac_data: # data we map in from other OAC configurations
- bootstrap_nodeid: bootstrap_host.bootstrap_nodeid
mapped_data: # data supplied directly to this deployment configuration, etc
debug: {get_input: debug}
bootstack_nodeid: {get_input: bootstack_nodeid}