From b6846d6e259b1dbc209acf273aac5b6627f00f0f Mon Sep 17 00:00:00 2001 From: zhoulinhui Date: Sat, 22 Aug 2020 13:19:02 +0800 Subject: [PATCH] Revert VMware deprecation Nova has reversed their deprecation of the VMware driver, and the Kolla community has shown an interest in it. Change-Id: I82f1074da56ed16c08317d1f92ed7f0a6f4a149a --- doc/source/reference/compute/index.rst | 5 ----- doc/source/reference/compute/nova-guide.rst | 4 ---- doc/source/reference/compute/vmware-guide.rst | 4 ---- etc/kolla/globals.yml | 3 --- releasenotes/notes/undeprecate-vmware-f6d84993ed8a4a8e.yaml | 6 ++++++ 5 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/undeprecate-vmware-f6d84993ed8a4a8e.yaml diff --git a/doc/source/reference/compute/index.rst b/doc/source/reference/compute/index.rst index f38377a85c..8ed8411b67 100644 --- a/doc/source/reference/compute/index.rst +++ b/doc/source/reference/compute/index.rst @@ -5,11 +5,6 @@ Compute This section describes configuring nova hypervisors and compute services. -.. note:: - - VMware support has been deprecated and will - be removed in the Victoria cycle. - .. toctree:: :maxdepth: 1 diff --git a/doc/source/reference/compute/nova-guide.rst b/doc/source/reference/compute/nova-guide.rst index dd470e67a6..ecb2c8732f 100644 --- a/doc/source/reference/compute/nova-guide.rst +++ b/doc/source/reference/compute/nova-guide.rst @@ -25,10 +25,6 @@ Information on the libvirt-based drivers ``kvm`` and ``qemu`` can be found in VMware ------ -.. note:: - - VMware support has been deprecated and will be removed in the Victoria cycle. - Information on the VMware-based driver ``vmware`` can be found in :doc:`vmware-guide`. diff --git a/doc/source/reference/compute/vmware-guide.rst b/doc/source/reference/compute/vmware-guide.rst index 1beeac598d..a205593b11 100644 --- a/doc/source/reference/compute/vmware-guide.rst +++ b/doc/source/reference/compute/vmware-guide.rst @@ -4,10 +4,6 @@ VMware - Nova Virtualisation Driver =================================== -.. note:: - - VMware support has been deprecated and will be removed in the Victoria cycle. - Overview ~~~~~~~~ diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 6b56b6e73a..dd76f10c02 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -611,9 +611,6 @@ ################################### # VMware - OpenStack VMware support ################################### - -# NOTE: VMware support has been deprecated and will be removed in the Victoria cycle. - #vmware_vcenter_host_ip: #vmware_vcenter_host_username: #vmware_vcenter_host_password: diff --git a/releasenotes/notes/undeprecate-vmware-f6d84993ed8a4a8e.yaml b/releasenotes/notes/undeprecate-vmware-f6d84993ed8a4a8e.yaml new file mode 100644 index 0000000000..d3706ab00d --- /dev/null +++ b/releasenotes/notes/undeprecate-vmware-f6d84993ed8a4a8e.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + VMware integration, which was deprecated in the Ussuri release, is no + longer deprecated. Nova has reversed the deprecation of its VMware driver, + and the Kolla community has shown interest in VMware.