aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.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-without-mergepy.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-without-mergepy.yaml')
-rw-r--r--overcloud-without-mergepy.yaml9
1 files changed, 3 insertions, 6 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 42e2e0dc..bd48ec66 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -711,17 +711,14 @@ resources:
replacement_policy: AUTO
ControllerBootstrapNodeConfig:
- type: OS::Heat::StructuredConfig
+ type: OS::TripleO::BootstrapNode::SoftwareConfig
properties:
- group: os-apply-config
- config:
- bootstrap_host:
- bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]}
+ bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]}
ControllerBootstrapNodeDeployment:
type: OS::Heat::StructuredDeployments
properties:
- config: {get_resource: ControllerBootstrapNodeConfig}
+ config: {get_attr: [ControllerBootstrapNodeConfig, config_id]}
servers: {get_attr: [Controller, attributes, nova_server_resource]}
signal_transport: NO_SIGNAL