Merge "Add nfs as a cinder backup driver option to CinderBackupBackend"

docker/services/pacemaker/cinder-backup.yaml

@@ -15,7 +15,7 @@ parameters:
     description: The short name of the Cinder Backup backend to use.
     type: string
     constraints:
-    - allowed_values: ['swift', 'ceph']
+    - allowed_values: ['swift', 'ceph', 'nfs']
   CinderBackupRbdPoolName:
     default: backups
     type: string

environments/storage-environment.yaml

@@ -20,7 +20,7 @@ parameter_defaults:
   CinderEnableIscsiBackend: false
   ## Whether to enable rbd (Ceph) backend for Cinder.
   CinderEnableRbdBackend: true
-  ## Cinder Backup backend can be either 'ceph' or 'swift'.
+  ## Cinder Backup backend can be either 'ceph', 'swift' or 'nfs'.
   CinderBackupBackend: ceph
   ## Whether to enable NFS backend for Cinder.
   # CinderEnableNfsBackend: false

puppet/services/cinder-backup.yaml

@@ -9,7 +9,7 @@ parameters:
     description: The short name of the Cinder Backup backend to use.
     type: string
     constraints:
-    - allowed_values: ['swift', 'ceph']
+    - allowed_values: ['swift', 'ceph', 'nfs']
   CinderBackupRbdPoolName:
     default: backups
     type: string
@@ -25,6 +25,15 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  CinderBackupNfsShare:
+    default: ''
+    description: NFS share to be mounted
+    type: string
+  CinderBackupNfsMountOptions:
+    default: ''
+    description: Mount options passed to the NFS client. See NFS man
+                 page for details.
+    type: string
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -85,6 +94,8 @@ outputs:
                 - {get_param: CephClusterName}
                 - '.conf'
             cinder::backup::swift::backup_swift_container: volumebackups
+            cinder::backup::nfs::backup_share: {get_param: CinderBackupNfsShare}
+            cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions}
       step_config:
         str_replace:
           template: "include ::tripleo::profile::base::cinder::backup::DRIVER"

puppet/services/pacemaker/cinder-backup.yaml

@@ -9,7 +9,7 @@ parameters:
     description: The short name of the Cinder Backup backend to use.
     type: string
     constraints:
-    - allowed_values: ['swift', 'ceph']
+    - allowed_values: ['swift', 'ceph', 'nfs']
   CinderBackupRbdPoolName:
     default: backups
     type: string

releasenotes/notes/add-cinder-backup-nfs-backend-0108fba91a3058ea.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds support for configuring the cinder-backup service with an NFS backend.
+fixes:
+  - |
+    Fixes `bug 1744174 <https://bugs.launchpad.net/tripleo/+bug/1744174>`__.