From 5af3b8e68b5d5351b3a53114d179a78ba1bf466f Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Thu, 6 Aug 2020 15:16:58 -0400 Subject: [PATCH] Remove deprecated config and auth Remove manila configuration options and auth classes that were deprecated before the Ussuri release. Change-Id: I148225926cd249a0dd8d1f8c02b22ed06487f405 --- doc/source/admin/gpfs_driver.rst | 2 - .../configuration/tables/manila-hnas.inc | 2 +- manila/api/auth.py | 37 ---- manila/common/config.py | 11 -- manila/compute/nova.py | 21 +-- manila/data/manager.py | 1 - manila/network/__init__.py | 1 - manila/network/neutron/api.py | 19 +- .../network/neutron/neutron_network_plugin.py | 9 +- manila/network/standalone_network_plugin.py | 18 +- manila/share/driver.py | 9 - .../dell_emc/plugins/powermax/connection.py | 3 - .../dell_emc/plugins/unity/connection.py | 8 - .../dell_emc/plugins/vnx/connection.py | 3 - manila/share/drivers/glusterfs/common.py | 2 - .../share/drivers/glusterfs/layout_volume.py | 1 - manila/share/drivers/hitachi/hnas/driver.py | 11 -- manila/share/drivers/hpe/hpe_3par_driver.py | 42 ++--- manila/share/drivers/ibm/gpfs.py | 11 -- manila/share/drivers/netapp/options.py | 6 - .../drivers/nexenta/ns4/nexenta_nfs_helper.py | 2 +- manila/share/drivers/nexenta/options.py | 1 - manila/share/hook.py | 18 +- manila/share/manager.py | 7 +- .../drivers/nexenta/ns4/test_nexenta_nas.py | 10 +- .../share/drivers/nexenta/ns5/test_jsonrpc.py | 2 +- manila/volume/cinder.py | 25 +-- ...ted-options-and-auth-4d497e03ad47e872.yaml | 165 ++++++++++++++++++ 28 files changed, 209 insertions(+), 238 deletions(-) delete mode 100644 manila/api/auth.py create mode 100644 releasenotes/notes/remove-deprecated-options-and-auth-4d497e03ad47e872.yaml diff --git a/doc/source/admin/gpfs_driver.rst b/doc/source/admin/gpfs_driver.rst index 1958aa2879..944f79ba3d 100644 --- a/doc/source/admin/gpfs_driver.rst +++ b/doc/source/admin/gpfs_driver.rst @@ -76,8 +76,6 @@ The following configuration parameters are optional: - `gpfs_nfs_server_type` = - `gpfs_nfs_server_list` = - `gpfs_ssh_port` = -- `knfs_export_options` = Restart of :term:`manila-share` service is needed for the configuration changes to take effect. diff --git a/doc/source/configuration/tables/manila-hnas.inc b/doc/source/configuration/tables/manila-hnas.inc index 39d5a67102..6d852022c6 100644 --- a/doc/source/configuration/tables/manila-hnas.inc +++ b/doc/source/configuration/tables/manila-hnas.inc @@ -18,5 +18,5 @@ - Description * - **[DEFAULT]** - - * - ``hds_hnas_driver_helper`` = ``manila.share.drivers.hitachi.ssh.HNASSSHBackend`` + * - ``hitachi_hnas_driver_helper`` = ``manila.share.drivers.hitachi.hnas.ssh.HNASSSHBackend`` - (String) Python class to be used for driver helper. diff --git a/manila/api/auth.py b/manila/api/auth.py deleted file mode 100644 index 2e3f1c2766..0000000000 --- a/manila/api/auth.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2013 OpenStack, LLC. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_log import log - -from manila.api.middleware import auth - -LOG = log.getLogger(__name__) - - -class ManilaKeystoneContext(auth.ManilaKeystoneContext): - def __init__(self, application): - LOG.warning('manila.api.auth:ManilaKeystoneContext is deprecated. ' - 'Please use ' - 'manila.api.middleware.auth:ManilaKeystoneContext ' - 'instead.') - super(ManilaKeystoneContext, self).__init__(application) - - -def pipeline_factory(loader, global_conf, **local_conf): - LOG.warning('manila.api.auth:pipeline_factory is deprecated. ' - 'Please use manila.api.middleware.auth:pipeline_factory ' - 'instead.') - auth.pipeline_factory(loader, global_conf, **local_conf) diff --git a/manila/common/config.py b/manila/common/config.py index c76630065d..e4a1769944 100644 --- a/manila/common/config.py +++ b/manila/common/config.py @@ -99,17 +99,6 @@ global_opts = [ help='Default share type to use.'), cfg.StrOpt('default_share_group_type', help='Default share group type to use.'), - cfg.ListOpt('memcached_servers', - help='Memcached servers or None for in process cache.', - deprecated_reason="The config option is not used. It should " - "not be confused with [keystone_authtoken]/memcached_servers.", - deprecated_for_removal=True), - cfg.StrOpt('share_usage_audit_period', - default='month', - deprecated_for_removal=True, - help='Time period to generate share usages for. ' - 'Time period must be hour, day, month or year.', - deprecated_reason="The config option is not used."), cfg.StrOpt('rootwrap_config', help='Path to the rootwrap configuration file to use for ' 'running commands as root.'), diff --git a/manila/compute/nova.py b/manila/compute/nova.py index d49ec2d1f1..060b9481fe 100644 --- a/manila/compute/nova.py +++ b/manila/compute/nova.py @@ -37,8 +37,6 @@ AUTH_OBJ = None nova_opts = [ cfg.StrOpt('api_microversion', default='2.10', - deprecated_group="DEFAULT", - deprecated_name="nova_api_microversion", help='Version of Nova API to be used.'), cfg.StrOpt('endpoint_type', default='publicURL', @@ -47,28 +45,11 @@ nova_opts = [ help='Region name for connecting to nova.'), ] -# These fallback options can be removed in/after 9.0.0 (Train) -deprecated_opts = { - 'cafile': [ - cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"), - cfg.DeprecatedOpt('ca_certificates_file', group=NOVA_GROUP), - cfg.DeprecatedOpt('nova_ca_certificates_file', group="DEFAULT"), - cfg.DeprecatedOpt('nova_ca_certificates_file', group=NOVA_GROUP), - ], - 'insecure': [ - cfg.DeprecatedOpt('api_insecure', group="DEFAULT"), - cfg.DeprecatedOpt('api_insecure', group=NOVA_GROUP), - cfg.DeprecatedOpt('nova_api_insecure', group="DEFAULT"), - cfg.DeprecatedOpt('nova_api_insecure', group=NOVA_GROUP), - ], -} - CONF = cfg.CONF CONF.register_opts(core_opts) CONF.register_opts(nova_opts, NOVA_GROUP) ks_loading.register_session_conf_options(CONF, - NOVA_GROUP, - deprecated_opts=deprecated_opts) + NOVA_GROUP) ks_loading.register_auth_conf_options(CONF, NOVA_GROUP) diff --git a/manila/data/manager.py b/manila/data/manager.py index f775135715..af3772cb43 100644 --- a/manila/data/manager.py +++ b/manila/data/manager.py @@ -37,7 +37,6 @@ data_opts = [ cfg.StrOpt( 'mount_tmp_location', default='/tmp/', - deprecated_name='migration_tmp_location', help="Temporary path to create and mount shares during migration."), cfg.BoolOpt( 'check_hash', diff --git a/manila/network/__init__.py b/manila/network/__init__.py index 2996627482..b8b8f79698 100644 --- a/manila/network/__init__.py +++ b/manila/network/__init__.py @@ -27,7 +27,6 @@ network_opts = [ 'network_api_class', default='manila.network.neutron.' 'neutron_network_plugin.NeutronNetworkPlugin', - deprecated_group='DEFAULT', help='The full class name of the Networking API class to use.'), ] diff --git a/manila/network/neutron/api.py b/manila/network/neutron/api.py index f607c825be..2d40f2e0a6 100644 --- a/manila/network/neutron/api.py +++ b/manila/network/neutron/api.py @@ -32,19 +32,14 @@ neutron_opts = [ cfg.StrOpt( 'url', default='http://127.0.0.1:9696', - deprecated_group="DEFAULT", - deprecated_name="neutron_url", help='URL for connecting to neutron.'), cfg.IntOpt( 'url_timeout', default=30, - deprecated_group="DEFAULT", - deprecated_name="neutron_url_timeout", help='Timeout value for connecting to neutron in seconds.'), cfg.StrOpt( 'auth_strategy', default='keystone', - deprecated_group="DEFAULT", help='Auth strategy for connecting to neutron in admin context.'), cfg.StrOpt( 'endpoint_type', @@ -55,18 +50,6 @@ neutron_opts = [ help='Region name for connecting to neutron in admin context.'), ] -# These fallback options can be removed in/after 9.0.0 (Train) -deprecated_opts = { - 'cafile': [ - cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"), - cfg.DeprecatedOpt('ca_certificates_file', group=NEUTRON_GROUP), - ], - 'insecure': [ - cfg.DeprecatedOpt('api_insecure', group="DEFAULT"), - cfg.DeprecatedOpt('api_insecure', group=NEUTRON_GROUP), - ], -} - CONF = cfg.CONF LOG = log.getLogger(__name__) @@ -86,7 +69,7 @@ class API(object): self.config_group_name = config_group_name or 'DEFAULT' ks_loading.register_session_conf_options( - CONF, NEUTRON_GROUP, deprecated_opts=deprecated_opts) + CONF, NEUTRON_GROUP) ks_loading.register_auth_conf_options(CONF, NEUTRON_GROUP) CONF.register_opts(neutron_opts, NEUTRON_GROUP) diff --git a/manila/network/neutron/neutron_network_plugin.py b/manila/network/neutron/neutron_network_plugin.py index d56ff4d442..a6dd1a0a3e 100644 --- a/manila/network/neutron/neutron_network_plugin.py +++ b/manila/network/neutron/neutron_network_plugin.py @@ -35,8 +35,7 @@ neutron_network_plugin_opts = [ 'neutron_physical_net_name', help="The name of the physical network to determine which net segment " "is used. This opt is optional and will only be used for " - "networks configured with multiple segments.", - deprecated_group='DEFAULT'), + "networks configured with multiple segments."), ] neutron_single_network_plugin_opts = [ @@ -44,15 +43,13 @@ neutron_single_network_plugin_opts = [ 'neutron_net_id', help="Default Neutron network that will be used for share server " "creation. This opt is used only with " - "class 'NeutronSingleNetworkPlugin'.", - deprecated_group='DEFAULT'), + "class 'NeutronSingleNetworkPlugin'."), cfg.StrOpt( 'neutron_subnet_id', help="Default Neutron subnet that will be used for share server " "creation. Should be assigned to network defined in opt " "'neutron_net_id'. This opt is used only with " - "class 'NeutronSingleNetworkPlugin'.", - deprecated_group='DEFAULT'), + "class 'NeutronSingleNetworkPlugin'."), ] neutron_bind_network_plugin_opts = [ diff --git a/manila/network/standalone_network_plugin.py b/manila/network/standalone_network_plugin.py index acc468aed6..613f0c9d87 100644 --- a/manila/network/standalone_network_plugin.py +++ b/manila/network/standalone_network_plugin.py @@ -26,13 +26,11 @@ from manila import utils standalone_network_plugin_opts = [ cfg.StrOpt( 'standalone_network_plugin_gateway', - help="Gateway address that should be used. Required.", - deprecated_group='DEFAULT'), + help="Gateway address that should be used. Required."), cfg.StrOpt( 'standalone_network_plugin_mask', help="Network mask that will be used. Can be either decimal " - "like '24' or binary like '255.255.255.0'. Required.", - deprecated_group='DEFAULT'), + "like '24' or binary like '255.255.255.0'. Required."), cfg.StrOpt( 'standalone_network_plugin_network_type', help="Network type, such as 'flat', 'vlan', 'vxlan' or 'gre'. " @@ -40,15 +38,13 @@ standalone_network_plugin_opts = [ "It will be assigned to share-network and share drivers will be " "able to use this for network interfaces within provisioned " "share servers. Optional.", - choices=['flat', 'vlan', 'vxlan', 'gre'], - deprecated_group='DEFAULT'), + choices=['flat', 'vlan', 'vxlan', 'gre']), cfg.IntOpt( 'standalone_network_plugin_segmentation_id', help="Set it if network has segmentation (VLAN, VXLAN, etc...). " "It will be assigned to share-network and share drivers will be " "able to use this for network interfaces within provisioned " - "share servers. Optional. Example: 1001", - deprecated_group='DEFAULT'), + "share servers. Optional. Example: 1001"), cfg.ListOpt( 'standalone_network_plugin_allowed_ip_ranges', help="Can be IP address, range of IP addresses or list of addresses " @@ -56,14 +52,12 @@ standalone_network_plugin_opts = [ "to be used. If empty, then will be assumed that all host " "addresses from network can be used. Optional. " "Examples: 10.0.0.10 or 10.0.0.10-10.0.0.20 or " - "10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40,10.0.0.50", - deprecated_group='DEFAULT'), + "10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40,10.0.0.50"), cfg.IntOpt( 'standalone_network_plugin_mtu', default=1500, help="Maximum Transmission Unit (MTU) value of the network. Default " - "value is 1500.", - deprecated_group='DEFAULT'), + "value is 1500."), ] CONF = cfg.CONF diff --git a/manila/share/driver.py b/manila/share/driver.py index 6f9cd751a5..ef3b96d42a 100644 --- a/manila/share/driver.py +++ b/manila/share/driver.py @@ -103,15 +103,6 @@ share_opts = [ "dictionary comprised of " "{'access_type1': ['share_proto1', 'share_proto2']," " 'access_type2': ['share_proto2', 'share_proto3']}."), - cfg.BoolOpt( - 'migration_readonly_rules_support', - default=True, - deprecated_for_removal=True, - deprecated_reason="All drivers are now required to support read-only " - "access rules.", - deprecated_name='migration_readonly_support', - help="Specify whether read only access rule mode is supported in this " - "backend. Obsolete."), cfg.StrOpt( "admin_network_config_group", help="If share driver requires to setup admin network for share, then " diff --git a/manila/share/drivers/dell_emc/plugins/powermax/connection.py b/manila/share/drivers/dell_emc/plugins/powermax/connection.py index 4139320b0a..a914749346 100644 --- a/manila/share/drivers/dell_emc/plugins/powermax/connection.py +++ b/manila/share/drivers/dell_emc/plugins/powermax/connection.py @@ -49,14 +49,11 @@ LOG = log.getLogger(__name__) POWERMAX_OPTS = [ cfg.StrOpt('powermax_server_container', - deprecated_name='vmax_server_container', help='Data mover to host the NAS server.'), cfg.ListOpt('powermax_share_data_pools', - deprecated_name='vmax_share_data_pools', help='Comma separated list of pools that can be used to ' 'persist share data.'), cfg.ListOpt('powermax_ethernet_ports', - deprecated_name='vmax_ethernet_ports', help='Comma separated list of ports that can be used for ' 'share server interfaces. Members of the list ' 'can be Unix-style glob expressions.') diff --git a/manila/share/drivers/dell_emc/plugins/unity/connection.py b/manila/share/drivers/dell_emc/plugins/unity/connection.py index 5e1d1b1ef3..1004352a7c 100644 --- a/manila/share/drivers/dell_emc/plugins/unity/connection.py +++ b/manila/share/drivers/dell_emc/plugins/unity/connection.py @@ -54,22 +54,14 @@ SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan') UNITY_OPTS = [ cfg.StrOpt('unity_server_meta_pool', required=True, - deprecated_name='emc_nas_server_pool', help='Pool to persist the meta-data of NAS server.'), cfg.ListOpt('unity_share_data_pools', - deprecated_name='emc_nas_pool_names', help='Comma separated list of pools that can be used to ' 'persist share data.'), cfg.ListOpt('unity_ethernet_ports', - deprecated_name='emc_interface_ports', help='Comma separated list of ports that can be used for ' 'share server interfaces. Members of the list ' 'can be Unix-style glob expressions.'), - cfg.StrOpt('emc_nas_server_container', - deprecated_for_removal=True, - deprecated_reason='Unity driver supports nas server auto load ' - 'balance.', - help='Storage processor to host the NAS server. Obsolete.'), cfg.StrOpt('unity_share_server', help='NAS server used for creating share when driver ' 'is in DHSS=False mode. It is required when ' diff --git a/manila/share/drivers/dell_emc/plugins/vnx/connection.py b/manila/share/drivers/dell_emc/plugins/vnx/connection.py index 2bd663ff29..ba530ddd83 100644 --- a/manila/share/drivers/dell_emc/plugins/vnx/connection.py +++ b/manila/share/drivers/dell_emc/plugins/vnx/connection.py @@ -48,14 +48,11 @@ LOG = log.getLogger(__name__) VNX_OPTS = [ cfg.StrOpt('vnx_server_container', - deprecated_name='emc_nas_server_container', help='Data mover to host the NAS server.'), cfg.ListOpt('vnx_share_data_pools', - deprecated_name='emc_nas_pool_names', help='Comma separated list of pools that can be used to ' 'persist share data.'), cfg.ListOpt('vnx_ethernet_ports', - deprecated_name='emc_interface_ports', help='Comma separated list of ports that can be used for ' 'share server interfaces. Members of the list ' 'can be Unix-style glob expressions.') diff --git a/manila/share/drivers/glusterfs/common.py b/manila/share/drivers/glusterfs/common.py index c9e544f64a..304672498e 100644 --- a/manila/share/drivers/glusterfs/common.py +++ b/manila/share/drivers/glusterfs/common.py @@ -33,13 +33,11 @@ LOG = log.getLogger(__name__) glusterfs_common_opts = [ cfg.StrOpt('glusterfs_server_password', secret=True, - deprecated_name='glusterfs_native_server_password', help='Remote GlusterFS server node\'s login password. ' 'This is not required if ' '\'glusterfs_path_to_private_key\' is ' 'configured.'), cfg.StrOpt('glusterfs_path_to_private_key', - deprecated_name='glusterfs_native_path_to_private_key', help='Path of Manila host\'s private SSH key file.'), ] diff --git a/manila/share/drivers/glusterfs/layout_volume.py b/manila/share/drivers/glusterfs/layout_volume.py index 27cd083778..d4d7e9b766 100644 --- a/manila/share/drivers/glusterfs/layout_volume.py +++ b/manila/share/drivers/glusterfs/layout_volume.py @@ -39,7 +39,6 @@ LOG = log.getLogger(__name__) glusterfs_volume_mapped_opts = [ cfg.ListOpt('glusterfs_servers', default=[], - deprecated_name='glusterfs_targets', help='List of GlusterFS servers that can be used to create ' 'shares. Each GlusterFS server should be of the form ' '[remoteuser@], and they are assumed to ' diff --git a/manila/share/drivers/hitachi/hnas/driver.py b/manila/share/drivers/hitachi/hnas/driver.py index a58c74ab84..3353f27978 100644 --- a/manila/share/drivers/hitachi/hnas/driver.py +++ b/manila/share/drivers/hitachi/hnas/driver.py @@ -31,50 +31,39 @@ LOG = log.getLogger(__name__) hitachi_hnas_opts = [ cfg.HostAddressOpt('hitachi_hnas_ip', - deprecated_name='hds_hnas_ip', help="HNAS management interface IP for communication " "between Manila controller and HNAS."), cfg.StrOpt('hitachi_hnas_user', - deprecated_name='hds_hnas_user', help="HNAS username Base64 String in order to perform tasks " "such as create file-systems and network interfaces."), cfg.StrOpt('hitachi_hnas_password', - deprecated_name='hds_hnas_password', secret=True, help="HNAS user password. Required only if private key is not " "provided."), cfg.IntOpt('hitachi_hnas_evs_id', - deprecated_name='hds_hnas_evs_id', help="Specify which EVS this backend is assigned to."), cfg.HostAddressOpt('hitachi_hnas_evs_ip', - deprecated_name='hds_hnas_evs_ip', help="Specify IP for mounting shares."), cfg.HostAddressOpt('hitachi_hnas_admin_network_ip', help="Specify IP for mounting shares in the Admin " "network."), cfg.StrOpt('hitachi_hnas_file_system_name', - deprecated_name='hds_hnas_file_system_name', help="Specify file-system name for creating shares."), cfg.StrOpt('hitachi_hnas_ssh_private_key', - deprecated_name='hds_hnas_ssh_private_key', secret=True, help="RSA/DSA private key value used to connect into HNAS. " "Required only if password is not provided."), cfg.HostAddressOpt('hitachi_hnas_cluster_admin_ip0', - deprecated_name='hds_hnas_cluster_admin_ip0', help="The IP of the clusters admin node. Only set in " "HNAS multinode clusters."), cfg.IntOpt('hitachi_hnas_stalled_job_timeout', - deprecated_name='hds_hnas_stalled_job_timeout', default=30, help="The time (in seconds) to wait for stalled HNAS jobs " "before aborting."), cfg.StrOpt('hitachi_hnas_driver_helper', - deprecated_name='hds_hnas_driver_helper', default='manila.share.drivers.hitachi.hnas.ssh.HNASSSHBackend', help="Python class to be used for driver helper."), cfg.BoolOpt('hitachi_hnas_allow_cifs_snapshot_while_mounted', - deprecated_name='hds_hnas_allow_cifs_snapshot_while_mounted', default=False, help="By default, CIFS snapshots are not allowed to be taken " "when the share has clients connected because consistent " diff --git a/manila/share/drivers/hpe/hpe_3par_driver.py b/manila/share/drivers/hpe/hpe_3par_driver.py index 6d03e9306a..53f3a8c822 100644 --- a/manila/share/drivers/hpe/hpe_3par_driver.py +++ b/manila/share/drivers/hpe/hpe_3par_driver.py @@ -122,66 +122,52 @@ HPE3PAR_OPTS = [ cfg.StrOpt('hpe3par_api_url', default='', help="3PAR WSAPI Server Url like " - "https://<3par ip>:8080/api/v1", - deprecated_name='hp3par_api_url'), + "https://<3par ip>:8080/api/v1"), cfg.StrOpt('hpe3par_username', default='', - help="3PAR username with the 'edit' role", - deprecated_name='hp3par_username'), + help="3PAR username with the 'edit' role"), cfg.StrOpt('hpe3par_password', default='', help="3PAR password for the user specified in hpe3par_username", - secret=True, - deprecated_name='hp3par_password'), + secret=True), cfg.HostAddressOpt('hpe3par_san_ip', - help="IP address of SAN controller", - deprecated_name='hp3par_san_ip'), + help="IP address of SAN controller"), cfg.StrOpt('hpe3par_san_login', default='', - help="Username for SAN controller", - deprecated_name='hp3par_san_login'), + help="Username for SAN controller"), cfg.StrOpt('hpe3par_san_password', default='', help="Password for SAN controller", - secret=True, - deprecated_name='hp3par_san_password'), + secret=True), cfg.PortOpt('hpe3par_san_ssh_port', default=22, - help='SSH port to use with SAN', - deprecated_name='hp3par_san_ssh_port'), + help='SSH port to use with SAN'), cfg.MultiOpt('hpe3par_fpg', item_type=FPG(min_ip=0, max_ip=FPG.MAX_SUPPORTED_IP_PER_VFS), - help="The File Provisioning Group (FPG) to use", - deprecated_name='hp3par_fpg'), + help="The File Provisioning Group (FPG) to use"), cfg.BoolOpt('hpe3par_fstore_per_share', default=False, - help="Use one filestore per share", - deprecated_name='hp3par_fstore_per_share'), + help="Use one filestore per share"), cfg.BoolOpt('hpe3par_require_cifs_ip', default=False, help="Require IP access rules for CIFS (in addition to user)"), cfg.BoolOpt('hpe3par_debug', default=False, - help="Enable HTTP debugging to 3PAR", - deprecated_name='hp3par_debug'), + help="Enable HTTP debugging to 3PAR"), cfg.StrOpt('hpe3par_cifs_admin_access_username', default='', - help="File system admin user name for CIFS.", - deprecated_name='hp3par_cifs_admin_access_username'), + help="File system admin user name for CIFS."), cfg.StrOpt('hpe3par_cifs_admin_access_password', default='', help="File system admin password for CIFS.", - secret=True, - deprecated_name='hp3par_cifs_admin_access_password'), + secret=True), cfg.StrOpt('hpe3par_cifs_admin_access_domain', default='LOCAL_CLUSTER', - help="File system domain for the CIFS admin user.", - deprecated_name='hp3par_cifs_admin_access_domain'), + help="File system domain for the CIFS admin user."), cfg.StrOpt('hpe3par_share_mount_path', default='/mnt/', help="The path where shares will be mounted when deleting " - "nested file trees.", - deprecated_name='hpe3par_share_mount_path'), + "nested file trees."), ] CONF = cfg.CONF diff --git a/manila/share/drivers/ibm/gpfs.py b/manila/share/drivers/ibm/gpfs.py index 3c09ad6c2e..7eb4bdb4f3 100644 --- a/manila/share/drivers/ibm/gpfs.py +++ b/manila/share/drivers/ibm/gpfs.py @@ -96,17 +96,6 @@ gpfs_share_opts = [ 'CES=manila.share.drivers.ibm.gpfs.CESHelper', ], help='Specify list of share export helpers.'), - cfg.StrOpt('knfs_export_options', - default=('rw,sync,no_root_squash,insecure,no_wdelay,' - 'no_subtree_check'), - help=('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.'), - deprecated_for_removal=True, - deprecated_reason="This option isn't used any longer. Please " - "use share-type extra specs for export " - "options."), ] diff --git a/manila/share/drivers/netapp/options.py b/manila/share/drivers/netapp/options.py index 399e0115c1..d0aa769624 100644 --- a/manila/share/drivers/netapp/options.py +++ b/manila/share/drivers/netapp/options.py @@ -31,7 +31,6 @@ netapp_proxy_opts = [ netapp_connection_opts = [ cfg.HostAddressOpt('netapp_server_hostname', - deprecated_name='netapp_nas_server_hostname', help='The hostname (or IP address) for the storage ' 'system.'), cfg.PortOpt('netapp_server_port', @@ -41,7 +40,6 @@ netapp_connection_opts = [ netapp_transport_opts = [ cfg.StrOpt('netapp_transport_type', - deprecated_name='netapp_nas_transport_type', default='http', help=('The transport protocol used when communicating with ' 'the storage system or proxy server. Valid values are ' @@ -57,11 +55,9 @@ netapp_transport_opts = [ netapp_basicauth_opts = [ cfg.StrOpt('netapp_login', - deprecated_name='netapp_nas_login', help=('Administrative user account name used to access the ' 'storage system.')), cfg.StrOpt('netapp_password', - deprecated_name='netapp_nas_password', help=('Password for the administrative user account ' 'specified in the netapp_login option.'), secret=True), ] @@ -74,7 +70,6 @@ netapp_provisioning_opts = [ 'option only applies when the option ' 'driver_handles_share_servers is set to True. '), cfg.StrOpt('netapp_volume_name_template', - deprecated_name='netapp_nas_volume_name_template', help='NetApp volume name template.', default='share_%(share_id)s'), cfg.StrOpt('netapp_vserver_name_template', @@ -101,7 +96,6 @@ netapp_provisioning_opts = [ 'This option only applies when the option ' 'driver_handles_share_servers is set to True.'), cfg.StrOpt('netapp_root_volume', - deprecated_name='netapp_root_volume_name', default='root', help='Root volume name.'), cfg.IntOpt('netapp_volume_snapshot_reserve_percent', diff --git a/manila/share/drivers/nexenta/ns4/nexenta_nfs_helper.py b/manila/share/drivers/nexenta/ns4/nexenta_nfs_helper.py index f9fab155a8..e02deb82cf 100644 --- a/manila/share/drivers/nexenta/ns4/nexenta_nfs_helper.py +++ b/manila/share/drivers/nexenta/ns4/nexenta_nfs_helper.py @@ -38,7 +38,7 @@ class NFSHelper(object): self.dataset_dedupe = self.configuration.nexenta_dataset_dedupe self.nms = None self.nms_protocol = self.configuration.nexenta_rest_protocol - self.nms_host = self.configuration.nexenta_host + self.nms_host = self.configuration.nexenta_nas_host self.volume = self.configuration.nexenta_volume self.share = self.configuration.nexenta_nfs_share self.nms_port = self.configuration.nexenta_rest_port diff --git a/manila/share/drivers/nexenta/options.py b/manila/share/drivers/nexenta/options.py index 44f11156f1..8f7c59ab30 100644 --- a/manila/share/drivers/nexenta/options.py +++ b/manila/share/drivers/nexenta/options.py @@ -82,7 +82,6 @@ nexenta_connection_opts = [ nexenta_nfs_opts = [ cfg.HostAddressOpt('nexenta_nas_host', - deprecated_name='nexenta_host', help='Data IP address of Nexenta storage appliance.', required=True), cfg.StrOpt('nexenta_mount_point_base', diff --git a/manila/share/hook.py b/manila/share/hook.py index a5a91ff9a2..dc98f25643 100644 --- a/manila/share/hook.py +++ b/manila/share/hook.py @@ -35,37 +35,31 @@ hook_options = [ cfg.BoolOpt( "enable_pre_hooks", default=False, - help="Whether to enable pre hooks or not.", - deprecated_group='DEFAULT'), + help="Whether to enable pre hooks or not."), cfg.BoolOpt( "enable_post_hooks", default=False, - help="Whether to enable post hooks or not.", - deprecated_group='DEFAULT'), + help="Whether to enable post hooks or not."), cfg.BoolOpt( "enable_periodic_hooks", default=False, - help="Whether to enable periodic hooks or not.", - deprecated_group='DEFAULT'), + help="Whether to enable periodic hooks or not."), cfg.BoolOpt( "suppress_pre_hooks_errors", default=False, help="Whether to suppress pre hook errors (allow driver perform " - "actions) or not.", - deprecated_group='DEFAULT'), + "actions) or not."), cfg.BoolOpt( "suppress_post_hooks_errors", default=False, help="Whether to suppress post hook errors (allow driver's results " - "to pass through) or not.", - deprecated_group='DEFAULT'), + "to pass through) or not."), cfg.FloatOpt( "periodic_hooks_interval", default=300.0, help="Interval in seconds between execution of periodic hooks. " "Used when option 'enable_periodic_hooks' is set to True. " - "Default is 300.", - deprecated_group='DEFAULT'), + "Default is 300."), ] CONF = cfg.CONF diff --git a/manila/share/manager.py b/manila/share/manager.py index 4965745010..5755c9cfd2 100644 --- a/manila/share/manager.py +++ b/manila/share/manager.py @@ -68,8 +68,7 @@ share_manager_opts = [ default=[], help='Driver(s) to perform some additional actions before and ' 'after share driver actions and on a periodic basis. ' - 'Default is [].', - deprecated_group='DEFAULT'), + 'Default is [].'), cfg.BoolOpt('delete_share_server_with_last_share', default=False, help='Whether share servers will ' @@ -84,8 +83,7 @@ share_manager_opts = [ help='If set to True, then Manila will delete all share ' 'servers which were unused more than specified time .' 'If set to False - automatic deletion of share servers ' - 'will be disabled.', - deprecated_group='DEFAULT'), + 'will be disabled.'), cfg.IntOpt('unused_share_server_cleanup_interval', default=10, help='Unallocated share servers reclamation time interval ' @@ -96,7 +94,6 @@ share_manager_opts = [ 'defines. This value reflects the shortest time Manila ' 'will wait for a share server to go unutilized before ' 'deleting it.', - deprecated_group='DEFAULT', min=10, max=60), cfg.IntOpt('replica_state_update_interval', diff --git a/manila/tests/share/drivers/nexenta/ns4/test_nexenta_nas.py b/manila/tests/share/drivers/nexenta/ns4/test_nexenta_nas.py index a37d72f5dd..efc76f6e3c 100644 --- a/manila/tests/share/drivers/nexenta/ns4/test_nexenta_nas.py +++ b/manila/tests/share/drivers/nexenta/ns4/test_nexenta_nas.py @@ -82,7 +82,7 @@ class TestNexentaNasDriver(test.TestCase): return getattr(self.cfg, opt) self.cfg = mock.Mock(spec=conf.Configuration) - self.cfg.nexenta_host = '1.1.1.1' + self.cfg.nexenta_nas_host = '1.1.1.1' super(TestNexentaNasDriver, self).setUp() self.ctx = context.get_admin_context() @@ -110,7 +110,7 @@ class TestNexentaNasDriver(test.TestCase): self.cfg.driver_handles_share_servers = False self.request_params = RequestParams( - 'http', self.cfg.nexenta_host, self.cfg.nexenta_rest_port, + 'http', self.cfg.nexenta_nas_host, self.cfg.nexenta_rest_port, '/rest/nms/', self.cfg.nexenta_user, self.cfg.nexenta_password) self.drv = nexenta_nas.NexentaNasDriver(configuration=self.cfg) @@ -185,7 +185,8 @@ class TestNexentaNasDriver(test.TestCase): } self.cfg.nexenta_thin_provisioning = False path = '%s/%s/%s' % (self.volume, self.share, share['name']) - location = {'path': '%s:/volumes/%s' % (self.cfg.nexenta_host, path)} + location = {'path': '%s:/volumes/%s' % ( + self.cfg.nexenta_nas_host, path)} post.return_value = FakeResponse() self.assertEqual([location], @@ -268,7 +269,8 @@ class TestNexentaNasDriver(test.TestCase): snapshot = {'name': 'sn1', 'share_name': share['name']} post.return_value = FakeResponse() path = '%s/%s/%s' % (self.volume, self.share, share['name']) - location = {'path': '%s:/volumes/%s' % (self.cfg.nexenta_host, path)} + location = {'path': '%s:/volumes/%s' % ( + self.cfg.nexenta_nas_host, path)} snapshot_name = '%s/%s/%s@%s' % ( self.volume, self.share, snapshot['share_name'], snapshot['name']) diff --git a/manila/tests/share/drivers/nexenta/ns5/test_jsonrpc.py b/manila/tests/share/drivers/nexenta/ns5/test_jsonrpc.py index ce4f14d077..10e8e7952a 100644 --- a/manila/tests/share/drivers/nexenta/ns5/test_jsonrpc.py +++ b/manila/tests/share/drivers/nexenta/ns5/test_jsonrpc.py @@ -1099,7 +1099,7 @@ class TestNefProxy(test.TestCase): proto = 'iscsi' cfg = copy.copy(self.cfg) cfg.nexenta_rest_addresses = '' - cfg.nexenta_host = '4.4.4.4' + cfg.nexenta_nas_host = '4.4.4.4' result = jsonrpc.NefProxy(proto, cfg.nexenta_folder, cfg) self.assertIsInstance(result, jsonrpc.NefProxy) diff --git a/manila/volume/cinder.py b/manila/volume/cinder.py index a9d2db63e3..7025f98685 100644 --- a/manila/volume/cinder.py +++ b/manila/volume/cinder.py @@ -38,15 +38,11 @@ AUTH_OBJ = None cinder_opts = [ cfg.BoolOpt('cross_az_attach', default=True, - deprecated_group="DEFAULT", - deprecated_name="cinder_cross_az_attach", help='Allow attaching between instances and volumes in ' 'different availability zones.'), cfg.IntOpt('http_retries', default=3, - help='Number of cinderclient retries on failed HTTP calls.', - deprecated_group='DEFAULT', - deprecated_name="cinder_http_retries"), + help='Number of cinderclient retries on failed HTTP calls.'), cfg.StrOpt('endpoint_type', default='publicURL', help='Endpoint type to be used with cinder client calls.'), @@ -54,29 +50,12 @@ cinder_opts = [ help='Region name for connecting to cinder.'), ] -# These fallback options can be removed in/after 9.0.0 (Train) -deprecated_opts = { - 'cafile': [ - cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"), - cfg.DeprecatedOpt('ca_certificates_file', group=CINDER_GROUP), - cfg.DeprecatedOpt('cinder_ca_certificates_file', group="DEFAULT"), - cfg.DeprecatedOpt('cinder_ca_certificates_file', group=CINDER_GROUP), - ], - 'insecure': [ - cfg.DeprecatedOpt('api_insecure', group="DEFAULT"), - cfg.DeprecatedOpt('api_insecure', group=CINDER_GROUP), - cfg.DeprecatedOpt('cinder_api_insecure', group="DEFAULT"), - cfg.DeprecatedOpt('cinder_api_insecure', group=CINDER_GROUP), - ], -} - CONF = cfg.CONF CONF.register_opts(core_opts) CONF.register_opts(cinder_opts, CINDER_GROUP) ks_loading.register_session_conf_options(CONF, - CINDER_GROUP, - deprecated_opts=deprecated_opts) + CINDER_GROUP) ks_loading.register_auth_conf_options(CONF, CINDER_GROUP) diff --git a/releasenotes/notes/remove-deprecated-options-and-auth-4d497e03ad47e872.yaml b/releasenotes/notes/remove-deprecated-options-and-auth-4d497e03ad47e872.yaml new file mode 100644 index 0000000000..82fabf3279 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-options-and-auth-4d497e03ad47e872.yaml @@ -0,0 +1,165 @@ +--- +upgrade: + - | + Deprecations made prior to the Ussuri release have been enforced, with the following impact to ``manila.conf``: + + - The deprecated ``memcached_servers`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``share_usage_audit_period`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``nova_api_microversion`` option in the [DEFAULT] has been removed. Use 'api_microversion' in the [nova] section instead. + + - The deprecated ``ca_certificates_file`` option in the [DEFAULT], [nova], [cinder], and [neutron] sections had no effect and has been removed. + + - The deprecated ``nova_ca_certificates_file`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``cinder_ca_certificates_file`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``api_insecure`` option in the [DEFAULT], [nova], [cinder], and [neutron[ sections had no effect and has been removed. + + - The deprecated ``nova_api_insecure`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``cinder_api_insecure`` option in the [DEFAULT] section had no effect and has been removed. + + - The deprecated ``migration_tmp_location`` option is no longer recognized. Use ``mount_tmp_location`` instead. + + - The ``network_api_class`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``neutron_url`` option can no longer be set in the [DEFAULT] section. Use the ``url`` option in the [neutron] section instead. + + - The ``neutron_url_timeout`` option can no longer be set in the [DEFAULT] section. Use the ``url_timeout`` option in the [neutron] section instead. + + - The ``auth_strategy`` option for neutron can no longer be set in the [DEFAULT] section. Set it in the [neutron] secton instead. + + - The ``neutron_physical_net_name`` option for neutron can no longer be set in the [DEFAULT] section. Set it in the [neutron] secton instead. + + - The ``neutron_net_id`` option for neutron can no longer be set in the [DEFAULT] section. Set it in the [neutron] secton instead. + + - The ``neutron_subnet_id`` option for neutron can no longer be set in the [DEFAULT] section. Set it in the [neutron] secton insteaad. + + - The ``standalone_network_plugin_gateway`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``standalone_network_plugin_mask`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``standalone_network_plugin_type`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``standalone_network_plugin_segmentation_id`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``standalone_network_plugin_allowed_ip_ranges`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``standalone_network_plugin_mtu`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The deprecated ``migration_readonly_rules_support`` is longer recognized. All manila back ends are now required to support read only access rules. + + - The deprecated Dell-EMC PowerMax ``vmax_server_container`` option is no longer recognized. Use ``powermax_server_container`` instead. + + - The deprecated Dell-EMC PowerMax ``vmax_share_data_pools`` option is no longer recognized. Use ``powermax_share_data_pools`` instead. + + - The deprecated Dell-EMC PowerMax ``vmax_ethernet_ports`` option is no longer recognized. Use ``powermax_ethernet_ports`` instead. + + - The deprecated Dell-EMC Unity ``emc_nas_server_pool`` option is no longer recognized. Use ``unity_server_meta_pool`` instead. + + - The deprecated Dell-EMC Unity ``emc_nas_pool_names`` option is no longer recognized. Use ``unity_share_data_pools`` instead. + + - The deprecated Dell-EMC Unity ``emc_interface_ports`` option is no longer recognized. Use ``unity_ethernet_ports`` instead. + + - The deprecated Dell-EMC Unity ``emc_nas_server_container`` option has no effect and has been removed. + + - The deprecated Dell-EMC VNX ``emc_nas_server_container`` option has been removed. Use ``vnx_server_container`` instead. + + - The deprecated Dell-EMC VNX ``emc_nas_pool_names`` option has been removed. Use ``vnx_share_data_pools`` instead. + + - The deprecated Dell-EMC VNX ``emc_interface_ports`` option has been removed. Use ``vnx_ethernet_ports`` instead. + + - The deprecated GlusterFS ``glusterfs_native_server_password`` option has been removed. Use ``glusterfs_server_password`` instead. + + - The deprecated GlusterFS ``glusterfs_native_path_to_private_key`` option has been removed. Use ``glusterfs_path_to_private_key`` instead. + + - The deprecated GlusterFS ``glusterfs_targets`` option has been removed. Use ``glusterfs_servers`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_driver_helper`` option has been removed. Use ``hitachi_hnas_driver_helper`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_ip`` option has been removed. Use ``hitachi_hnas_ip`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_user`` option has been removed. Use ``hitachi_hnas_user`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_password`` option has been removed. Use ``hitachi_hnas_password`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_evs_id`` option has been removed. Use ``hitachi_evs_id`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_file_system_name`` option has been removed. Use ``hitachi_hnas_file_system_name`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_cluster_admin_ip0`` option has been removed. Use ``hitachi_hnas_cluster_admin_ip0`` instead. + - The deprecated Hitachi HNAS ``hds_hnas_stalled_job_timeout`` option has been removed. Use ``hitachi_hnas_stalled_job_timeout`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_driver_helper`` option has been removed. Use ``hitachi_hnas_driver_helper`` instead. + + - The deprecated Hitachi HNAS ``hds_hnas_allow_cifs_snapshot_while_mounted`` option has been removed. Use ``hitachi_allow_cifs_snapshot_while_mounted`` instead. + + - The deprecated HPE 3PAR ``hp3par_api_url`` option has been removed. Use ``hpe3par_api_url`` instead. + + - The deprecated HPE 3PAR ``hp3par_username`` option has been removed. Use ``hpe3par_username`` instead. + + - The deprecated HPE 3PAR ``hp3par_password`` option has been removed. Use ``hpe3par_password`` instead. + + - The deprecated HPE 3PAR ``hp3par_san_ip`` option has been removed. Use ``hpe3par_san_ip`` instead. + + - The deprecated HPE 3PAR ``hp3par_san_login`` option has been removed. Use ``hpe3par_san_login`` instead. + + - The deprecated HPE 3PAR ``hp3par_san_password`` option has been removed. Use ``hpe3par_san_password`` instead. + + - The deprecated HPE 3PAR ``hp3par_san_ssh_port`` option has been removed. Use ``hpe3par_san_ssh_port`` instead. + + - The deprecated HPE 3PAR ``hp3par_fpg`` option has been removed. Use ``hpe3par_fpg`` instead. + + - The deprecated HPE 3PAR ``hp3par_fstore_per_share`` option has been removed. Use ``hpe3par_fstore_per_share`` instead. + + - The deprecated HPE 3PAR ``hp3par_debug`` option has been removed. Use ``hpe3par_debug`` instead. + + - The deprecated HPE 3PAR ``hp3par_cifs_admin_access_username`` option has been removed. Use ``hpe3par_cifs_admin_access_username`` instead. + + - The deprecated HPE 3PAR ``hp3par_cifs_admin_access_password`` option has been removed. Use ``hpe3par_cifs_admin_access_password`` instead. + + - The deprecated HPE 3PAR ``hp3par_cifs_admin_access_domain`` option has been removed. Use ``hpe3par_cifs_admin_access_domain`` instead. + + - The deprecated HPE 3PAR ``hp3par_share_mount_path`` option has been removed. Use ``hpe3par_share_mount_path`` instead. + + - The deprecated IBM GPFS ``knfs_export_options`` option had no effect and has been removed. + + - The deprecated Netapp ``netapp_nas_server_hostname`` option has been removed. Use ``netapp_server_hostname`` instead. + + - The deprecated Netapp ``netapp_nas_transport_type`` option has been removed. Use ``netapp_transport_type`` instead. + + - The deprecated Netapp ``netapp_nas_login`` option has been removed. Use ``netapp_login`` instead. + + - The deprecated Netapp ``netapp_nas_password`` option has been removed. Use ``netapp_password`` instead. + + - The deprecated Netapp ``netapp_nas_volume_name_template`` option has been removed. Use ``netapp_volume_name_template`` instead. + + - The deprecated Netapp ``netapp_root_volume_name`` option has been removed. Use ``netapp_root_volume`` instead. + + - The deprecated Nexenta ``nexenta_host`` option has been removed. Use ``nexenta_nas_host`` instead. + + - The ``enable_pre_hooks`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``enable_post_hooks`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``enable_periodic_hooks`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``enable_pre_hooks_errors`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``enable_post_hooks_errors`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``periodic_hooks_interval`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``hook_drivers`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``automatic_share_server_cleanup`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``unused_share_server_cleanup_interval`` option can no longer be set in the [DEFAULT] section. Set it in backend sections instead. + + - The ``cinder_cross_az_attach`` option can no longer be set in the [DEFAULT] section. Use ``cross_az_attach`` in the [CINDER] section instead. + + - The ``cinder_http_retries`` option can no longer be set in the [DEFAULT] section. Use ``http_retries`` in the [CINDER] section instead. + + - The ``cinder_cross_az_attach`` option can no longer be set in the [DEFAULT] section. Use ``cross_az_attach`` in the [CINDER] section instead.