commit b6846d6e259b1dbc209acf273aac5b6627f00f0f
Author: zhoulinhui <df.some@foxmail.com>
Date:   Sat Aug 22 13:19:02 2020 +0800

    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

diff --git a/doc/source/reference/compute/index.rst b/doc/source/reference/compute/index.rst
index f38377a..8ed8411 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 dd470e6..ecb2c87 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 1beeac5..a205593 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 6b56b6e..dd76f10 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 0000000..d3706ab
--- /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.