Merge "Set rabbitmq heatbeat timeout threshold to 60"

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

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index 15092ba..5f9f537 100644 (file)
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -42,6 +42,18 @@ parameters:
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
+  ExtraConfig:
+    default: {}
+    description: |
+      Additional configuration to inject into the cluster. Note
+      that CephStorageExtraConfig takes precedence over ExtraConfig.
+    type: json
+  CephStorageExtraConfig:
+    default: {}
+    description: |
+      Role specific additional configuration to inject into the cluster.
+    type: json
+
 
 resources:
   CephStorage: