From 62ab434139c4576afe84b7b0b08374261fc79563 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 19 Feb 2015 08:41:47 -0800 Subject: Split out BootstrapNode SoftwareConfig This patch splits out the BootstrapNode config such that alternate implementation (puppet for example) can implement their own SoftwareConfig's via a nested stack. This is controlled by the standard overcloud heat environment. For os-apply-config deployments the implementation should work the same as before. For puppet deployments the implementation uses hiera metadata to configure bootstrap_nodeid. Change-Id: I691a9d7c474866038a5d47beab295899b5479d03 --- puppet/controller-puppet.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'puppet/controller-puppet.yaml') 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} -- cgit 1.2.3-korg