summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorShiva Prasad Rao <shivrao@cisco.com>2015-08-03 14:07:49 -0700
committerShiva Prasad Rao <shivrao@cisco.com>2015-08-03 14:15:47 -0700
commit5471a9903e1b73b4d19cba8c4c6d4d997e090658 (patch)
treee7a6e632f558caaab5fe92c3056fe475f4766502 /puppet
parent5a6e934b4b8d6fab7b899c368fb82321e1a0cbe3 (diff)
Wire in Compute pre-deployment extraconfig
This commit provides a way to configure some additional hieradata for compute nodes. This is similar to the earlier added infra for supporting Controller pre-deployment extraconfig. Change-Id: I02dda0685c7df9013693db5eeacb2f47745d05b5
Diffstat (limited to 'puppet')
-rw-r--r--puppet/compute-puppet.yaml13
1 files changed, 12 insertions, 1 deletions
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]}