From a49ee142d7eeb9fdb0d313563c1a7984dd99d3f1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 13 Jan 2021 22:43:55 +0900
Subject: [PATCH] Undeprecate support of the vmwareapi driver

Nova initially deprecated its support of the vmwareapi driver but
that deprecation was reverted during Victoria cycle[1].

[1] 498b41f65b88fd36a2ac4cb2c14df6fc0c612950

Change-Id: I003b265039ff8517882ffb699a17cbd678a33f08
---
 manifests/compute/vmware.pp                                  | 4 ----
 .../notes/undeprecate-vmwareapi-1e32ae1ad843433c.yaml        | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/undeprecate-vmwareapi-1e32ae1ad843433c.yaml

diff --git a/manifests/compute/vmware.pp b/manifests/compute/vmware.pp
index b15346927..22de54b19 100644
--- a/manifests/compute/vmware.pp
+++ b/manifests/compute/vmware.pp
@@ -1,6 +1,5 @@
 # == Class: nova::compute::vmware
 #
-# DEPRECATED !
 # Configure the VMware compute driver for nova.
 #
 # === Parameters
@@ -76,9 +75,6 @@ class nova::compute::vmware(
 
   include nova::deps
 
-  warning('The nova::compute::vmware class is deprecated and will be removed \
-in a future release. The vmwareapi driver has been deprecated in nova')
-
   nova_config {
     'DEFAULT/compute_driver':    value => $compute_driver;
     'vmware/host_ip':            value => $host_ip;
diff --git a/releasenotes/notes/undeprecate-vmwareapi-1e32ae1ad843433c.yaml b/releasenotes/notes/undeprecate-vmwareapi-1e32ae1ad843433c.yaml
new file mode 100644
index 000000000..fd61377bf
--- /dev/null
+++ b/releasenotes/notes/undeprecate-vmwareapi-1e32ae1ad843433c.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Support of the vmwareapi driver was initially deprecated, but it was
+    undeprecated because nova has undeprecated its support.