Merge "Enable proxy header parsing for heat"

[apex-tripleo-heat-templates.git] / puppet / compute-post.yaml

diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index b4a6126..a122df0 100644 (file)
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack compute node post deployment for Puppet.
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -13,10 +17,23 @@ parameters:
 
 resources:
 
+  ComputeArtifactsConfig:
+    type: deploy-artifacts.yaml
+
+  ComputeArtifactsDeploy:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      servers:  {get_param: servers}
+      config: {get_resource: ComputeArtifactsConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
   ComputePuppetConfig:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -24,7 +41,9 @@ resources:
 
   ComputePuppetDeployment:
     type: OS::Heat::StructuredDeployments
+    depends_on: ComputeArtifactsDeploy
     properties:
+      name: ComputePuppetDeployment
       servers:  {get_param: servers}
       config: {get_resource: ComputePuppetConfig}
       input_values: