aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-19 08:41:47 -0800
committerDan Prince <dprince@redhat.com>2015-02-19 10:36:13 -0800
commit62ab434139c4576afe84b7b0b08374261fc79563 (patch)
tree12e18057c81ceb462bd0e80537f5f4830d92cad9 /overcloud-resource-registry-puppet.yaml
parent112a42f34d4384eab729f039ad60b88cc714d09b (diff)
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
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r--overcloud-resource-registry-puppet.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 56699484..b487f425 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -9,6 +9,7 @@ resource_registry:
OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
+ OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
# NOTE(dprince): requires a new release of python-heatclient
#default_parameters: