Merge "Include bulk in swift proxy pipeline"

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

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 7d00ffa..d0f562e 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -91,10 +91,17 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ConfigCommand:
+    type: string
+    description: Command which will be run whenever configuration data changes
+    default: os-refresh-config --timeout 14400
 
 resources:
   BlockStorage:
     type: OS::Nova::Server
+    metadata:
+      os-collect-config:
+        command: {get_param: ConfigCommand}
     properties:
       image:
         {get_param: Image}
@@ -379,11 +386,3 @@ outputs:
   management_ip_address:
     description: IP address of the server in the management network
     value: {get_attr: [ManagementPort, ip_address]}
-  config_identifier:
-    description: identifier which changes if the node configuration may need re-applying
-    value:
-      list_join:
-        - ''
-        - - {get_attr: [BlockStorageDeployment, deploy_stdout]}
-          - {get_attr: [NodeTLSCAData, deploy_stdout]}
-          - {get_param: UpdateIdentifier}