Merge "BlockStore: Exec puppet after all configuration"

2 files changed, 26 insertions, 16 deletions

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
new file mode 100644
index 00000000..960cc5b3
--- /dev/null
+++ b/puppet/cinder-storage-post.yaml
@@ -0,0 +1,26 @@
+heat_template_version: 2014-10-16
+description: 'Common Block Storage Post Deployment'
+# NOTE: this is a noop for os-apply-config style deployments because
+# post deployment ordering is controlled by tripleo-image-elements
+
+parameters:
+  servers:
+    type: json
+
+resources:
+
+  VolumePuppetConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: puppet
+      outputs:
+      - name: result
+      config:
+        get_file: manifests/overcloud_volume.pp
+
+  VolumePuppetDeployment:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      name: puppet_1
+      servers:  {get_param: servers}
+      config: {get_resource: VolumePuppetConfig}
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index befd8e4e..6ad4d348 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -160,22 +160,6 @@ resources:
                 ntp::servers: {get_input: ntp_servers}
                 enable_package_install: {get_input: enable_package_install}
 
-  VolumePuppetConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: puppet
-      outputs:
-      - name: result
-      config:
-        get_file: manifests/overcloud_volume.pp
-
-  VolumePuppetDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      name: puppet_1
-      server: {get_resource: BlockStorage}
-      config: {get_resource: VolumePuppetConfig}
-
 outputs:
   hosts_entry:
     value: