From: Shiva Prasad Rao <shivrao@cisco.com>
Date: Mon, 3 Aug 2015 21:07:49 +0000 (-0700)
Subject: Wire in Compute pre-deployment extraconfig
X-Git-Tag: opnfv-6.0.0~2408^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5471a9903e1b73b4d19cba8c4c6d4d997e090658;p=apex-tripleo-heat-templates.git

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
---

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]}