From 07a9e0ea75707345761cc05e8f076df086cb413c Mon Sep 17 00:00:00 2001 From: kedar-vidvans Date: Mon, 5 Jan 2015 17:07:55 -0500 Subject: [PATCH] After the addition of ZFSSA NFS driver, the configuration table xml file for zfssa needs to be split into two separate files, so that documentation for iSCSI and NFS drivers can reference them separately. The documentation for ZFSSA NFS driver will be submitted as part of another patch. Change-Id: Idc20abf695b4d44479f42865e409b7d79fbb2b68 Closes-bug: 1407795 --- .../cinder.flagmappings | 18 +++++++++--------- .../cinder.headers | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 0f28a2b497..532c93f1c9 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -494,8 +494,8 @@ zadara_vpsa_ip zadara zadara_vpsa_poolname zadara zadara_vpsa_port zadara zadara_vpsa_use_ssl zadara -zfssa_data_ip zfssa -zfssa_https_port zfssa +zfssa_data_ip zfssa-nfs +zfssa_https_port zfssa-nfs zfssa_initiator zfssa zfssa_initiator_config zfssa zfssa_initiator_group zfssa @@ -505,15 +505,15 @@ zfssa_lun_compression zfssa zfssa_lun_logbias zfssa zfssa_lun_sparse zfssa zfssa_lun_volblocksize zfssa -zfssa_nfs_mount_options zfssa -zfssa_nfs_pool zfssa -zfssa_nfs_project zfssa -zfssa_nfs_share zfssa -zfssa_nfs_share_compression zfssa -zfssa_nfs_share_logbias zfssa +zfssa_nfs_mount_options zfssa-nfs +zfssa_nfs_pool zfssa-nfs +zfssa_nfs_project zfssa-nfs +zfssa_nfs_share zfssa-nfs +zfssa_nfs_share_compression zfssa-nfs +zfssa_nfs_share_logbias zfssa-nfs zfssa_pool zfssa zfssa_project zfssa -zfssa_rest_timeout zfssa +zfssa_rest_timeout zfssa zfssa-nfs zfssa_target_group zfssa zfssa_target_interfaces zfssa zfssa_target_password zfssa diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers index b32ba6419d..8c163a68b7 100644 --- a/tools/autogenerate-config-flagmappings/cinder.headers +++ b/tools/autogenerate-config-flagmappings/cinder.headers @@ -50,6 +50,7 @@ windows Windows xiv IBM XIV and DS8000 volume driver zadara Zadara Storage driver zfssa ZFS Storage Appliance iSCSI driver +zfssa-nfs ZFS Storage Appliance NFS driver zones zones zoning zoning zoning_fabric zoning fabrics