Merge "Add ExtraConfig example that always runs on update"

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

diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index 5ccfa58..da33acf 100644 (file)
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -15,6 +15,8 @@ parameter_defaults:
   NovaEnableRbdBackend: true
   ## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
   GlanceBackend: rbd
+  ## Gnocchi backend can be either 'rbd' (Ceph), 'swift' or 'file'.
+  GnocchiBackend: rbd
 
 
   #### CINDER NFS SETTINGS ####
@@ -32,6 +34,8 @@ parameter_defaults:
   ## File system type of the mount
   # GlanceFilePcmkFstype: nfs
   ## Pacemaker mount point, e.g. '192.168.122.1:/export/glance' for NFS
+  ##  (If using IPv6, use both double- and single-quotes,
+  ##  e.g. "'[fdd0::1]:/export/glance'")
   # GlanceFilePcmkDevice: ''
   ## Options for the mount managed by Pacemaker
   # GlanceFilePcmkOptions: ''
@@ -43,9 +47,10 @@ parameter_defaults:
   ## OSDs are deployed on dedicated ceph-storage nodes only.
   # ControllerEnableCephStorage: false
 
-  ## When deploying Ceph through the oscplugin CLI, the following
+  ## When deploying Ceph Nodes through the oscplugin CLI, the following
   ## parameters are set automatically by the CLI. When deploying via
-  ## heat stack-create, they need to be provided manually.
+  ## heat stack-create or ceph on the controller nodes only,
+  ## they need to be provided manually.
 
   ## Number of Ceph storage nodes to deploy
   # CephStorageCount: 0