Merge "Compute: Exec puppet after all configuration"

2 files changed, 25 insertions, 15 deletions

diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post-puppet.yaml
new file mode 100644
index 00000000..9b7eb0cf
--- /dev/null
+++ b/puppet/compute-post-puppet.yaml
@@ -0,0 +1,25 @@
+heat_template_version: 2014-10-16
+
+description: >
+  OpenStack compute node post deployment for Puppet.
+
+parameters:
+  servers:
+    type: json
+
+resources:
+
+  ComputePuppetConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: puppet
+      outputs:
+      - name: result
+      config:
+        get_file: manifests/overcloud_compute.pp
+
+  ComputePuppetDeployment:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      servers:  {get_param: servers}
+      config: {get_resource: ComputePuppetConfig}
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index ab2d0a32..e6b5a78b 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -260,21 +260,6 @@ resources:
         bridge_name: {get_param: NeutronPhysicalBridge}
         interface_name: {get_param: NeutronPublicInterface}
 
-  ComputePuppetConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: puppet
-      outputs:
-      - name: result
-      config:
-        get_file: manifests/overcloud_compute.pp
-
-  ComputePuppetDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      server: {get_resource: NovaCompute}
-      config: {get_resource: ComputePuppetConfig}
-
   NovaComputeConfig:
     type: OS::Heat::StructuredConfig
     properties: