From 3c3362b94702f07e60df1e2f9bf5ccac2ed7e3e5 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Thu, 14 May 2015 17:29:27 +0200 Subject: [PATCH] Recategorize cinder NFS backup options The new table will be integrated in https://review.openstack.org/#/c/182817/ Change-Id: Ie2cc7c652f06064075cc68623438c45998b10701 --- doc/common/tables/cinder-backups.xml | 28 ----------- doc/common/tables/cinder-backups_nfs.xml | 50 +++++++++++++++++++ .../cinder.flagmappings | 14 +++--- .../cinder.headers | 1 + 4 files changed, 58 insertions(+), 35 deletions(-) create mode 100644 doc/common/tables/cinder-backups_nfs.xml diff --git a/doc/common/tables/cinder-backups.xml b/doc/common/tables/cinder-backups.xml index 295df66309..cd3366be6f 100644 --- a/doc/common/tables/cinder-backups.xml +++ b/doc/common/tables/cinder-backups.xml @@ -25,22 +25,10 @@ = zlib (StrOpt) Compression algorithm (None to disable) - - = None - (StrOpt) Custom container to use for backups. - = cinder.backup.drivers.swift (StrOpt) Driver to use for backups. - - = True - (BoolOpt) Enable or Disable the timer to send the periodic progress notifications to Ceilometer when backing up the volume to the backend storage. The default value is True to enable the timer. - - - = 1999994880 - (IntOpt) The maximum size in bytes of the files used to hold backups. If the volume being backed up exceeds this size, then it will be backed up into multiple files. - = cinder.backup.manager.BackupManager (StrOpt) Full class name for the Manager for volume backup @@ -49,14 +37,6 @@ = 2 (IntOpt) Backup metadata version to be used when backing up volume metadata. If this number is bumped, make sure the service doing the restore supports the new version. - - = None - (StrOpt) Mount options passed to the NFS client. See NFS man page for details. - - - = $state_path/backup_mount - (StrOpt) Base dir containing mount point for NFS share. - = backup-%s (StrOpt) Template string to be used to generate backup names @@ -65,14 +45,6 @@ = 10 (IntOpt) The number of chunks or objects, for which one Ceilometer notification will be sent - - = 32768 - (IntOpt) The size in bytes that changes are tracked for incremental backups. backup_swift_object_size has to be multiple of backup_swift_block_size. - - - = None - (StrOpt) NFS share in fqdn:path, ipv4addr:path, or "[ipv6addr]:path" format. - = 120 (IntOpt) Interval, in seconds, between two progress notifications reporting the backup status diff --git a/doc/common/tables/cinder-backups_nfs.xml b/doc/common/tables/cinder-backups_nfs.xml new file mode 100644 index 0000000000..c86f9c9278 --- /dev/null +++ b/doc/common/tables/cinder-backups_nfs.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of NFS backup driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
= None(StrOpt) Custom container to use for backups.
= True(BoolOpt) Enable or Disable the timer to send the periodic progress notifications to Ceilometer when backing up the volume to the backend storage. The default value is True to enable the timer.
= 1999994880(IntOpt) The maximum size in bytes of the files used to hold backups. If the volume being backed up exceeds this size, then it will be backed up into multiple files.
= None(StrOpt) Mount options passed to the NFS client. See NFS man page for details.
= $state_path/backup_mount(StrOpt) Base dir containing mount point for NFS share.
= 32768(IntOpt) The size in bytes that changes are tracked for incremental backups. backup_swift_object_size has to be multiple of backup_swift_block_size.
= None(StrOpt) NFS share in fqdn:path, ipv4addr:path, or "[ipv6addr]:path" format.
+ diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index c189a3ba74..b5d2799f90 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -15,18 +15,18 @@ backup_ceph_stripe_count backups_ceph backup_ceph_stripe_unit backups_ceph backup_ceph_user backups_ceph backup_compression_algorithm backups -backup_container backups +backup_container backups_nfs backup_driver backups -backup_enable_progress_timer backups -backup_file_size backups +backup_enable_progress_timer backups_nfs +backup_file_size backups_nfs backup_manager backups backup_metadata_version backups -backup_mount_options backups -backup_mount_point_base backups +backup_mount_options backups_nfs +backup_mount_point_base backups_nfs backup_name_template backups backup_object_number_per_notification backups -backup_sha_block_size_bytes backups -backup_share backups +backup_sha_block_size_bytes backups_nfs +backup_share backups_nfs backup_swift_auth backups_swift backup_swift_auth_version backups_swift backup_swift_block_size backups_swift diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers index 768f2f586c..20737df5ed 100644 --- a/tools/autogenerate-config-flagmappings/cinder.headers +++ b/tools/autogenerate-config-flagmappings/cinder.headers @@ -1,5 +1,6 @@ backups backups backups_ceph Ceph backup driver +backups_nfs NFS backup driver backups_swift Swift backup driver backups_tsm IBM Tivoli Storage Manager backup driver block-device block device