From d2a3713fe74c65b958e8860c0fab1bec0eb4e1be Mon Sep 17 00:00:00 2001 From: Bob Callaway Date: Thu, 16 Oct 2014 20:31:01 -0400 Subject: [PATCH] Update help text for netapp_server_port option https://review.openstack.org/#/c/128700/ merged upstream in Kilo last night; this change is a result of running the autohelp-wrapper from openstack-doc-tools on the master branch of cinder. Change-Id: I1eb4ebb7e819e62d0d956f853f0f77265d07016e --- doc/common/tables/cinder-netapp_7mode_iscsi.xml | 4 ++-- doc/common/tables/cinder-netapp_7mode_nfs.xml | 4 ++-- doc/common/tables/cinder-netapp_cdot_iscsi.xml | 4 ++-- doc/common/tables/cinder-netapp_cdot_nfs.xml | 4 ++-- doc/common/tables/cinder-netapp_eseries_iscsi.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/common/tables/cinder-netapp_7mode_iscsi.xml b/doc/common/tables/cinder-netapp_7mode_iscsi.xml index 08df7b9bee..583efb06ce 100644 --- a/doc/common/tables/cinder-netapp_7mode_iscsi.xml +++ b/doc/common/tables/cinder-netapp_7mode_iscsi.xml @@ -30,8 +30,8 @@ (StrOpt) The hostname (or IP address) for the storage system or proxy server. - netapp_server_port = 80 - (IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server. + netapp_server_port = None + (IntOpt) The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and 8443 for HTTPS. netapp_size_multiplier = 1.2 diff --git a/doc/common/tables/cinder-netapp_7mode_nfs.xml b/doc/common/tables/cinder-netapp_7mode_nfs.xml index 8d6ed933a8..4fdc04d3dd 100644 --- a/doc/common/tables/cinder-netapp_7mode_nfs.xml +++ b/doc/common/tables/cinder-netapp_7mode_nfs.xml @@ -34,8 +34,8 @@ (StrOpt) The hostname (or IP address) for the storage system or proxy server. - netapp_server_port = 80 - (IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server. + netapp_server_port = None + (IntOpt) The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and 8443 for HTTPS. netapp_storage_family = ontap_cluster diff --git a/doc/common/tables/cinder-netapp_cdot_iscsi.xml b/doc/common/tables/cinder-netapp_cdot_iscsi.xml index 942d28cd29..7e53617cf3 100644 --- a/doc/common/tables/cinder-netapp_cdot_iscsi.xml +++ b/doc/common/tables/cinder-netapp_cdot_iscsi.xml @@ -30,8 +30,8 @@ (StrOpt) The hostname (or IP address) for the storage system or proxy server. - netapp_server_port = 80 - (IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server. + netapp_server_port = None + (IntOpt) The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and 8443 for HTTPS. netapp_size_multiplier = 1.2 diff --git a/doc/common/tables/cinder-netapp_cdot_nfs.xml b/doc/common/tables/cinder-netapp_cdot_nfs.xml index 3da96c466c..edac093179 100644 --- a/doc/common/tables/cinder-netapp_cdot_nfs.xml +++ b/doc/common/tables/cinder-netapp_cdot_nfs.xml @@ -38,8 +38,8 @@ (StrOpt) The hostname (or IP address) for the storage system or proxy server. - netapp_server_port = 80 - (IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server. + netapp_server_port = None + (IntOpt) The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and 8443 for HTTPS. netapp_storage_family = ontap_cluster diff --git a/doc/common/tables/cinder-netapp_eseries_iscsi.xml b/doc/common/tables/cinder-netapp_eseries_iscsi.xml index e0b42e01b1..ab2f5ff230 100644 --- a/doc/common/tables/cinder-netapp_eseries_iscsi.xml +++ b/doc/common/tables/cinder-netapp_eseries_iscsi.xml @@ -38,8 +38,8 @@ (StrOpt) The hostname (or IP address) for the storage system or proxy server. - netapp_server_port = 80 - (IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server. + netapp_server_port = None + (IntOpt) The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and 8443 for HTTPS. netapp_storage_family = ontap_cluster