Merge "NetApp NFS ONTAP: Deprecate Copy Offload Tool"
This commit is contained in:
commit
1bebf4af85
@ -31,6 +31,7 @@ import time
|
|||||||
from oslo_concurrency import processutils
|
from oslo_concurrency import processutils
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_log import versionutils
|
||||||
from oslo_utils import netutils
|
from oslo_utils import netutils
|
||||||
from oslo_utils import units
|
from oslo_utils import units
|
||||||
import six
|
import six
|
||||||
@ -675,6 +676,11 @@ class NetAppNfsDriver(driver.ManageableVD,
|
|||||||
major, minor = self.zapi_client.get_ontapi_version()
|
major, minor = self.zapi_client.get_ontapi_version()
|
||||||
col_path = self.configuration.netapp_copyoffload_tool_path
|
col_path = self.configuration.netapp_copyoffload_tool_path
|
||||||
|
|
||||||
|
if col_path:
|
||||||
|
msg = ('The "netapp_copyoffload_tool_path" configuration option '
|
||||||
|
'is deprecated and will be removed soon. Please, do not '
|
||||||
|
'set it.')
|
||||||
|
versionutils.report_deprecated_feature(LOG, msg)
|
||||||
try:
|
try:
|
||||||
cache_result = self._find_image_in_cache(image_id)
|
cache_result = self._find_image_in_cache(image_id)
|
||||||
if cache_result:
|
if cache_result:
|
||||||
|
@ -129,7 +129,10 @@ netapp_nfs_extra_opts = [
|
|||||||
help=('This option specifies the path of the NetApp copy '
|
help=('This option specifies the path of the NetApp copy '
|
||||||
'offload tool binary. Ensure that the binary has execute '
|
'offload tool binary. Ensure that the binary has execute '
|
||||||
'permissions set which allow the effective user of the '
|
'permissions set which allow the effective user of the '
|
||||||
'cinder-volume process to execute the file.')), ]
|
'cinder-volume process to execute the file.'),
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='The CopyOfflload tool is no longer '
|
||||||
|
'available for downloading.'), ]
|
||||||
netapp_san_opts = [
|
netapp_san_opts = [
|
||||||
cfg.StrOpt('netapp_lun_ostype',
|
cfg.StrOpt('netapp_lun_ostype',
|
||||||
help=('This option defines the type of operating system that'
|
help=('This option defines the type of operating system that'
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
Deprecate NetApp NFS option `netapp_copyoffload_tool_path`. The tool is no longer
|
||||||
|
available for downloading.
|
Loading…
Reference in New Issue
Block a user