diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-08-18 19:14:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-08-18 19:14:03 +0000 |
| commit | 6f7b2fefb0eb5b5ae3f0b26be2255fd1ac78b75d (patch) | |
| tree | 795d51c842852eb82185e8face18a6eb902cd8d7 | |
| parent | 91af5ac557564648378dab150e4537da166fd286 (diff) | |
| parent | 5471a9903e1b73b4d19cba8c4c6d4d997e090658 (diff) | |
Merge "Wire in Compute pre-deployment extraconfig"
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 17c1470f..523e4477 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -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 diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index e85a96aa..7966fd48 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -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]} |