Deprecate support for VMWare vSphere
The vmwareapi virt driver in nova was marked experimenta[1] and may be removed in a future release. Once this driver is removed, we may no longer have any way to integrate VMWare vSphere hypervisor in OpenStack deployments. [1] 713ef7839670bd5d73af52c211a14932adc933ba Change-Id: Ifb17fed132fb4acb4a23049ed2f4e9eeabd0055d
This commit is contained in:
parent
7d0ac89c3f
commit
297089a622
@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
"""Implementation of Inspector abstraction for VMware vSphere"""
|
"""Implementation of Inspector abstraction for VMware vSphere"""
|
||||||
|
|
||||||
|
import warnings
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_utils import units
|
from oslo_utils import units
|
||||||
|
|
||||||
@ -30,34 +32,53 @@ opt_group = cfg.OptGroup(name='vmware',
|
|||||||
OPTS = [
|
OPTS = [
|
||||||
cfg.HostAddressOpt('host_ip',
|
cfg.HostAddressOpt('host_ip',
|
||||||
default='127.0.0.1',
|
default='127.0.0.1',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere has been '
|
||||||
|
'deprecated',
|
||||||
help='IP address of the VMware vSphere host.'),
|
help='IP address of the VMware vSphere host.'),
|
||||||
cfg.PortOpt('host_port',
|
cfg.PortOpt('host_port',
|
||||||
default=443,
|
default=443,
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='Port of the VMware vSphere host.'),
|
help='Port of the VMware vSphere host.'),
|
||||||
cfg.StrOpt('host_username',
|
cfg.StrOpt('host_username',
|
||||||
default='',
|
default='',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='Username of VMware vSphere.'),
|
help='Username of VMware vSphere.'),
|
||||||
cfg.StrOpt('host_password',
|
cfg.StrOpt('host_password',
|
||||||
default='',
|
default='',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='Password of VMware vSphere.',
|
help='Password of VMware vSphere.',
|
||||||
secret=True),
|
secret=True),
|
||||||
cfg.StrOpt('ca_file',
|
cfg.StrOpt('ca_file',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='CA bundle file to use in verifying the vCenter server '
|
help='CA bundle file to use in verifying the vCenter server '
|
||||||
'certificate.'),
|
'certificate.'),
|
||||||
cfg.BoolOpt('insecure',
|
cfg.BoolOpt('insecure',
|
||||||
default=False,
|
default=False,
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='If true, the vCenter server certificate is not '
|
help='If true, the vCenter server certificate is not '
|
||||||
'verified. If false, then the default CA truststore is '
|
'verified. If false, then the default CA truststore is '
|
||||||
'used for verification. This option is ignored if '
|
'used for verification. This option is ignored if '
|
||||||
'"ca_file" is set.'),
|
'"ca_file" is set.'),
|
||||||
cfg.IntOpt('api_retry_count',
|
cfg.IntOpt('api_retry_count',
|
||||||
default=10,
|
default=10,
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='Number of times a VMware vSphere API may be retried.'),
|
help='Number of times a VMware vSphere API may be retried.'),
|
||||||
cfg.FloatOpt('task_poll_interval',
|
cfg.FloatOpt('task_poll_interval',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
default=0.5,
|
default=0.5,
|
||||||
help='Sleep time in seconds for polling an ongoing async '
|
help='Sleep time in seconds for polling an ongoing async '
|
||||||
'task.'),
|
'task.'),
|
||||||
cfg.StrOpt('wsdl_location',
|
cfg.StrOpt('wsdl_location',
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
deprecated_reason='Support for VMWare vSphere is deprecated',
|
||||||
help='Optional vim service WSDL location '
|
help='Optional vim service WSDL location '
|
||||||
'e.g http://<server>/vimService.wsdl. '
|
'e.g http://<server>/vimService.wsdl. '
|
||||||
'Optional over-ride to default location for bug '
|
'Optional over-ride to default location for bug '
|
||||||
@ -98,6 +119,9 @@ class VsphereInspector(virt_inspector.Inspector):
|
|||||||
self._ops = vsphere_operations.VsphereOperations(
|
self._ops = vsphere_operations.VsphereOperations(
|
||||||
get_api_session(self.conf), 1000)
|
get_api_session(self.conf), 1000)
|
||||||
|
|
||||||
|
warnings.warn('Support for VMWare vSphere is deprecated.',
|
||||||
|
category=DeprecationWarning, stacklevel=3)
|
||||||
|
|
||||||
def _get_vm_mobj_not_power_off_or_raise(self, instance):
|
def _get_vm_mobj_not_power_off_or_raise(self, instance):
|
||||||
vm_mobj = self._ops.get_vm_mobj(instance.id)
|
vm_mobj = self._ops.get_vm_mobj(instance.id)
|
||||||
|
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
Support for VMWare vSphere has been deprecated, because the vmwareapi
|
||||||
|
virt driver in nova has been marked experimental and may be removed in
|
||||||
|
a future release.
|
Loading…
Reference in New Issue
Block a user