diff --git a/doc/common/tables/manila-amqp.xml b/doc/common/tables/manila-amqp.xml index 9677b703bc..558fa45d9b 100644 --- a/doc/common/tables/manila-amqp.xml +++ b/doc/common/tables/manila-amqp.xml @@ -1,8 +1,26 @@ - + diff --git a/doc/common/tables/manila-api.xml b/doc/common/tables/manila-api.xml index 143735cba7..23ca17e5fc 100644 --- a/doc/common/tables/manila-api.xml +++ b/doc/common/tables/manila-api.xml @@ -1,8 +1,26 @@ - +
Description of AMQP configuration options
diff --git a/doc/common/tables/manila-auth.xml b/doc/common/tables/manila-auth.xml index 42afa31a62..93e62771b1 100644 --- a/doc/common/tables/manila-auth.xml +++ b/doc/common/tables/manila-auth.xml @@ -1,8 +1,26 @@ - +
Description of API configuration options
diff --git a/doc/common/tables/manila-auth_token.xml b/doc/common/tables/manila-auth_token.xml index b472316405..a19f5bcb07 100644 --- a/doc/common/tables/manila-auth_token.xml +++ b/doc/common/tables/manila-auth_token.xml @@ -1,8 +1,26 @@ - +
Description of Authorization configuration options
diff --git a/doc/common/tables/manila-ca.xml b/doc/common/tables/manila-ca.xml index 401c1a454e..7633487e40 100644 --- a/doc/common/tables/manila-ca.xml +++ b/doc/common/tables/manila-ca.xml @@ -1,8 +1,26 @@ - +
Description of Authorization Token configuration options
diff --git a/doc/common/tables/manila-common.xml b/doc/common/tables/manila-common.xml index 5fd6148c3d..8d67152eb5 100644 --- a/doc/common/tables/manila-common.xml +++ b/doc/common/tables/manila-common.xml @@ -1,8 +1,26 @@ - +
Description of Certificate Authority configuration options
diff --git a/doc/common/tables/manila-compute.xml b/doc/common/tables/manila-compute.xml index 9e854d468d..c4e6f4efcf 100644 --- a/doc/common/tables/manila-compute.xml +++ b/doc/common/tables/manila-compute.xml @@ -1,8 +1,26 @@ - +
Description of Common configuration options
diff --git a/doc/common/tables/manila-cors.xml b/doc/common/tables/manila-cors.xml index 332553e609..20bfad2a8e 100644 --- a/doc/common/tables/manila-cors.xml +++ b/doc/common/tables/manila-cors.xml @@ -1,8 +1,26 @@ - +
Description of Compute configuration options
diff --git a/doc/common/tables/manila-database.xml b/doc/common/tables/manila-database.xml index f1de2a60e8..7c3a629b6c 100644 --- a/doc/common/tables/manila-database.xml +++ b/doc/common/tables/manila-database.xml @@ -1,8 +1,26 @@ - +
Description of CORS configuration options
diff --git a/doc/common/tables/manila-emc.xml b/doc/common/tables/manila-emc.xml index 64aeb38734..96d005fa22 100644 --- a/doc/common/tables/manila-emc.xml +++ b/doc/common/tables/manila-emc.xml @@ -1,8 +1,26 @@ - +
Description of Database configuration options
diff --git a/doc/common/tables/manila-ganesha.xml b/doc/common/tables/manila-ganesha.xml index cdc7f42a6d..a08851aeba 100644 --- a/doc/common/tables/manila-ganesha.xml +++ b/doc/common/tables/manila-ganesha.xml @@ -1,8 +1,26 @@ - +
Description of EMC Share Drivers configuration options
@@ -37,6 +55,10 @@ + + + + diff --git a/doc/common/tables/manila-glusterfs.xml b/doc/common/tables/manila-glusterfs.xml index 624feb2634..80d628423d 100644 --- a/doc/common/tables/manila-glusterfs.xml +++ b/doc/common/tables/manila-glusterfs.xml @@ -1,8 +1,26 @@ - +
Description of Ganesha configuration options
= /etc/manila/ganesha-export-templ.d (StrOpt) Path to directory containing Ganesha export block templates. (Ganesha module only.)
= maxread = 65536, prefread = 65536(StrOpt) Options to use when exporting a share using ganesha NFS server. Note that these defaults can be overridden when a share is created by passing metadata with key name export_options. Also note the complete set of default ganesha export options is specified in ganesha_utils. (GPFS only.)
= ganesha.nfsd (StrOpt) Name of the ganesha nfs service.
diff --git a/doc/common/tables/manila-gpfs.xml b/doc/common/tables/manila-gpfs.xml new file mode 100644 index 0000000000..4cd7b7a40d --- /dev/null +++ b/doc/common/tables/manila-gpfs.xml @@ -0,0 +1,80 @@ + + + +
Description of GlusterFS Share Drivers configuration options
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of IBM GPFS Share Driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
= $state_path/mnt(StrOpt) Base folder where exported shares are located.
= None(ListOpt) A list of the fully qualified NFS server names that make up the OpenStack Manila configuration.
= KNFS(StrOpt) NFS Server type. Valid choices are "KNFS" (kernel NFS) or "GNFS" (Ganesha NFS).
= None(StrOpt) IP to be added to GPFS export string.
= KNFS=manila.share.drivers.ibm.gpfs.KNFSHelper, GNFS=manila.share.drivers.ibm.gpfs.GNFSHelper(ListOpt) Specify list of share export helpers.
= None(StrOpt) GPFS server SSH login name.
= None(StrOpt) GPFS server SSH login password. The password is not needed, if 'gpfs_ssh_private_key' is configured.
= 22(IntOpt) GPFS server SSH port.
= None(StrOpt) Path to GPFS server SSH private key for login.
= rw,sync,no_root_squash,insecure,no_wdelay,no_subtree_check(StrOpt) Options to use when exporting a share using kernel NFS server. Note that these defaults can be overridden when a share is created by passing metadata with key name export_options.
+ diff --git a/doc/common/tables/manila-hdfs.xml b/doc/common/tables/manila-hdfs.xml index f06ea8a8a1..d637980bbb 100644 --- a/doc/common/tables/manila-hdfs.xml +++ b/doc/common/tables/manila-hdfs.xml @@ -1,8 +1,26 @@ - + diff --git a/doc/common/tables/manila-hds_hnas.xml b/doc/common/tables/manila-hds_hnas.xml index 5b71f187f6..2d2bdf96a3 100644 --- a/doc/common/tables/manila-hds_hnas.xml +++ b/doc/common/tables/manila-hds_hnas.xml @@ -1,8 +1,26 @@ - +
Description of HDFS Share Driver configuration options
diff --git a/doc/common/tables/manila-hp3par.xml b/doc/common/tables/manila-hp3par.xml index f5a3cea1b4..1e47b1242b 100644 --- a/doc/common/tables/manila-hp3par.xml +++ b/doc/common/tables/manila-hp3par.xml @@ -1,8 +1,26 @@ - +
Description of HDS NAS Share Driver configuration options
diff --git a/doc/common/tables/manila-huawei.xml b/doc/common/tables/manila-huawei.xml index dfc7192b92..ba1697f225 100644 --- a/doc/common/tables/manila-huawei.xml +++ b/doc/common/tables/manila-huawei.xml @@ -1,8 +1,26 @@ - +
Description of HP 3PAR Share Driver configuration options
diff --git a/doc/common/tables/manila-logging.xml b/doc/common/tables/manila-logging.xml index 8f1168b993..cdc0f8d31d 100644 --- a/doc/common/tables/manila-logging.xml +++ b/doc/common/tables/manila-logging.xml @@ -1,8 +1,26 @@ - +
Description of Huawei Share Driver configuration options
diff --git a/doc/common/tables/manila-netapp.xml b/doc/common/tables/manila-netapp.xml index c3092c64e6..7383ad928b 100644 --- a/doc/common/tables/manila-netapp.xml +++ b/doc/common/tables/manila-netapp.xml @@ -1,8 +1,26 @@ - +
Description of Logging configuration options
diff --git a/doc/common/tables/manila-qpid.xml b/doc/common/tables/manila-qpid.xml index d0a46e43c7..32afcb4120 100644 --- a/doc/common/tables/manila-qpid.xml +++ b/doc/common/tables/manila-qpid.xml @@ -1,8 +1,26 @@ - +
Description of NetApp Share Drivers configuration options
diff --git a/doc/common/tables/manila-quobyte.xml b/doc/common/tables/manila-quobyte.xml index 22e56cf6aa..3bba63fcd7 100644 --- a/doc/common/tables/manila-quobyte.xml +++ b/doc/common/tables/manila-quobyte.xml @@ -1,8 +1,26 @@ - +
Description of QPID configuration options
diff --git a/doc/common/tables/manila-quota.xml b/doc/common/tables/manila-quota.xml index 93e7389eb6..4bcef10f95 100644 --- a/doc/common/tables/manila-quota.xml +++ b/doc/common/tables/manila-quota.xml @@ -1,8 +1,26 @@ - +
Description of Quobyte Share Driver configuration options
diff --git a/doc/common/tables/manila-rabbitmq.xml b/doc/common/tables/manila-rabbitmq.xml index 8cb6ea60c1..c1920e185d 100644 --- a/doc/common/tables/manila-rabbitmq.xml +++ b/doc/common/tables/manila-rabbitmq.xml @@ -1,8 +1,26 @@ - +
Description of Quota configuration options
diff --git a/doc/common/tables/manila-redis.xml b/doc/common/tables/manila-redis.xml index a129ba29fb..3a5e9b47c6 100644 --- a/doc/common/tables/manila-redis.xml +++ b/doc/common/tables/manila-redis.xml @@ -1,8 +1,26 @@ - +
Description of RabbitMQ configuration options
diff --git a/doc/common/tables/manila-rpc.xml b/doc/common/tables/manila-rpc.xml index 88ed725878..b5d9510689 100644 --- a/doc/common/tables/manila-rpc.xml +++ b/doc/common/tables/manila-rpc.xml @@ -1,8 +1,26 @@ - +
Description of Redis configuration options
diff --git a/doc/common/tables/manila-san.xml b/doc/common/tables/manila-san.xml index c0d863fa8d..61e4424430 100644 --- a/doc/common/tables/manila-san.xml +++ b/doc/common/tables/manila-san.xml @@ -1,8 +1,26 @@ - +
Description of RPC configuration options
diff --git a/doc/common/tables/manila-scheduler.xml b/doc/common/tables/manila-scheduler.xml index a2fd9e9cc1..c67fe8d5e2 100644 --- a/doc/common/tables/manila-scheduler.xml +++ b/doc/common/tables/manila-scheduler.xml @@ -1,8 +1,26 @@ - +
Description of SAN configuration options
diff --git a/doc/common/tables/manila-share.xml b/doc/common/tables/manila-share.xml index 5066af4a70..545e9db50c 100644 --- a/doc/common/tables/manila-share.xml +++ b/doc/common/tables/manila-share.xml @@ -1,8 +1,26 @@ - +
Description of Scheduler configuration options
diff --git a/doc/common/tables/manila-storage.xml b/doc/common/tables/manila-storage.xml index 9594920bcf..a84b9b356f 100644 --- a/doc/common/tables/manila-storage.xml +++ b/doc/common/tables/manila-storage.xml @@ -1,8 +1,26 @@ - +
Description of Share configuration options
diff --git a/doc/common/tables/manila-winrm.xml b/doc/common/tables/manila-winrm.xml index f6455beebb..fab10810c1 100644 --- a/doc/common/tables/manila-winrm.xml +++ b/doc/common/tables/manila-winrm.xml @@ -1,8 +1,26 @@ - +
Description of Storage configuration options
diff --git a/doc/common/tables/manila-zeromq.xml b/doc/common/tables/manila-zeromq.xml index 08abf4e473..09984eca94 100644 --- a/doc/common/tables/manila-zeromq.xml +++ b/doc/common/tables/manila-zeromq.xml @@ -1,8 +1,26 @@ - +
Description of WinRM configuration options
diff --git a/doc/common/tables/manila-zfssa.xml b/doc/common/tables/manila-zfssa.xml index 61ed435bae..de94891b92 100644 --- a/doc/common/tables/manila-zfssa.xml +++ b/doc/common/tables/manila-zfssa.xml @@ -1,8 +1,26 @@ - +
Description of ZeroMQ configuration options
diff --git a/doc/config-reference/shared-file-systems/section_manila-misc.xml b/doc/config-reference/shared-file-systems/section_manila-misc.xml index d2c62a91a7..569833961d 100644 --- a/doc/config-reference/shared-file-systems/section_manila-misc.xml +++ b/doc/config-reference/shared-file-systems/section_manila-misc.xml @@ -22,6 +22,7 @@ + diff --git a/tools/autogenerate-config-flagmappings/manila.flagmappings b/tools/autogenerate-config-flagmappings/manila.flagmappings index 28820e1918..399a452a78 100644 --- a/tools/autogenerate-config-flagmappings/manila.flagmappings +++ b/tools/autogenerate-config-flagmappings/manila.flagmappings @@ -50,6 +50,7 @@ ganesha_config_path ganesha ganesha_db_path ganesha ganesha_export_dir ganesha ganesha_export_template_dir ganesha +ganesha_nfs_export_options ganesha ganesha_service_name ganesha glusterfs_ganesha_server_ip glusterfs glusterfs_ganesha_server_password glusterfs @@ -62,6 +63,15 @@ glusterfs_servers glusterfs glusterfs_share_layout glusterfs glusterfs_target glusterfs glusterfs_volume_pattern glusterfs +gpfs_mount_point_base gpfs +gpfs_nfs_server_list gpfs +gpfs_nfs_server_type gpfs +gpfs_share_export_ip gpfs +gpfs_share_helpers gpfs +gpfs_ssh_login gpfs +gpfs_ssh_password gpfs +gpfs_ssh_port gpfs +gpfs_ssh_private_key gpfs hdfs_namenode_ip hdfs hdfs_namenode_port hdfs hdfs_ssh_name hdfs @@ -93,6 +103,7 @@ hp3par_username hp3par instance_format logging instance_uuid_format logging interface_driver share +knfs_export_options gpfs log_config_append logging log_date_format logging log_dir logging
Description of ZFSSA Share Driver configuration options