openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Wire in Compute pre-deployment extraconfig"

Browse Source
This commit is contained in:
Jenkins 2015-08-18 19:14:03 +00:00 committed by Gerrit Code Review
commit 6f7b2fefb0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
overcloud-resource-registry-puppet.yaml
View File

@ -29,6 +29,7 @@ resource_registry:
# NodeExtraConfigPost == All nodes configuration post service deployment
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
# TripleO overcloud networks

13
puppet/compute-puppet.yaml
View File

@ -485,6 +485,13 @@ resources:
server: {get_param: NtpServer}
enable_package_install: {get_param: EnablePackageInstall}
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
ComputeExtraConfigPre:
depends_on: NovaComputeDeployment
type: OS::TripleO::ComputeExtraConfigPre
properties:
server: {get_resource: NovaCompute}
UpdateConfig:
type: OS::TripleO::Tasks::PackageUpdate
@ -528,4 +535,8 @@ outputs:
{get_resource: NovaCompute}
config_identifier:
description: identifier which changes if the node configuration may need re-applying
value: {get_attr: [NovaComputeDeployment, deploy_stdout]}
value:
list_join:
- ','
- - {get_attr: [NovaComputeDeployment, deploy_stdout]}
- {get_attr: [ComputeExtraConfigPre, deploy_stdout]}