composable keystone services

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

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index 1b5b944..e90710c 100644 (file)
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -4,18 +4,35 @@ description: >
   OpenStack ceph storage 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:
      type: json
      description: Value which changes if the node configuration may need to be re-applied
 
-
 resources:
+
+  CephStorageArtifactsConfig:
+    type: deploy-artifacts.yaml
+
+  CephStorageArtifactsDeploy:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      servers:  {get_param: servers}
+      config: {get_resource: CephStorageArtifactsConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
   CephStoragePuppetConfig:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -23,7 +40,9 @@ resources:
 
   CephStorageDeployment_Step1:
     type: OS::Heat::StructuredDeployments
+    depends_on: CephStorageArtifactsDeploy
     properties:
+      name: CephStorageDeployment_Step1
       servers:  {get_param: servers}
       config: {get_resource: CephStoragePuppetConfig}
       input_values: