X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fstorage-environment.yaml;h=8e02c3009511565ef90b0cb0f634d0fc150cc201;hb=0ec618ec8875ecc523c21842ef56a71d9f5e9347;hp=2529ea1475bd04f1c834fa7426f604899930b8a9;hpb=4789de6b314d56440e023bbc5956662b94a2c3f3;p=apex-tripleo-heat-templates.git

diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index 2529ea14..8e02c300 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -14,6 +14,8 @@ parameter_defaults:
   CinderEnableIscsiBackend: false
   ## Whether to enable rbd (Ceph) backend for Cinder.
   CinderEnableRbdBackend: true
+  ## Cinder Backup backend can be either 'ceph' or 'swift'.
+  CinderBackupBackend: ceph
   ## Whether to enable NFS backend for Cinder.
   # CinderEnableNfsBackend: false
   ## Whether to enable rbd (Ceph) backend for Nova ephemeral storage.
@@ -32,18 +34,18 @@ parameter_defaults:
   # CinderNfsServers: ''
 
 
-  #### GLANCE FILE BACKEND PACEMAKER SETTINGS (used for mounting NFS) ####
+  #### GLANCE NFS SETTINGS ####
 
-  ## Whether to make Glance 'file' backend a mount managed by Pacemaker
-  # GlanceFilePcmkManage: false
-  ## 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: ''
+  ## Make sure to set `GlanceBackend: file` when enabling NFS
+  ##
+  ## Whether to make Glance 'file' backend a NFS mount
+  # GlanceNfsEnabled: false
+  ## NFS share for image storage, e.g. '192.168.122.1:/export/glance'
+  ## (If using IPv6, use both double- and single-quotes,
+  ## e.g. "'[fdd0::1]:/export/glance'")
+  # GlanceNfsShare: ''
+  ## Mount options for the NFS image storage mount point
+  # GlanceNfsOptions: 'intr,context=system_u:object_r:glance_var_lib_t:s0'
 
 
   #### CEPH SETTINGS ####
@@ -61,3 +63,5 @@ parameter_defaults:
   # CephMonKey: ''
   ## Ceph admin key, e.g. 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   # CephAdminKey: ''
+  ## Ceph client key, e.g 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
+  # CephClientKey: ''