Merge "Revert VMware deprecation"

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
 

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`.
 

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
 ~~~~~~~~
 

etc/kolla/globals.yml

@@ -639,9 +639,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:

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.