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 --- overcloud-without-mergepy.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'overcloud-without-mergepy.yaml') 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 -- cgit 1.2.3-korg