From fd0a561bea956f1b62f6ca5a27e762cb76ad9a90 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 19 Feb 2021 20:38:33 +0900
Subject: [PATCH] Deprecate support for Xen

Since Nova removed its XenAPI driver[1] and Xen support using libvirt,
we no longer expect usage of Xen in OpenStack deployments.

[1] adb28f503ca8c38bd7224ec0a335f730557d7ca9
[1] 3a390c2c8238409c00acc08fad725d46fa02c0ad

Change-Id: Id79799541dfc8ec17d3ea1482c6b8ca4b58f7a92
---
 ceilometer/compute/virt/inspector.py                     | 5 ++++-
 ceilometer/compute/virt/xenapi/inspector.py              | 9 +++++++++
 .../notes/deprecate-xen-support-27600e2bf7be548c.yaml    | 5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/deprecate-xen-support-27600e2bf7be548c.yaml

diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py
index 0ec9bc7317..dbbc7281eb 100644
--- a/ceilometer/compute/virt/inspector.py
+++ b/ceilometer/compute/virt/inspector.py
@@ -28,7 +28,7 @@ OPTS = [
                default='libvirt',
                help='Inspector to use for inspecting the hypervisor layer. '
                     'Known inspectors are libvirt, hyperv, vsphere '
-                    'and xenapi.'),
+                    'and xenapi. Note that xenapi has been deprecated.'),
 ]
 
 
@@ -270,6 +270,9 @@ class Inspector(object):
 
 
 def get_hypervisor_inspector(conf):
+    if conf.hypervisor_inspector == 'xenapi':
+        LOG.warning('Support for XenServer/Xen Cloud Platform has been '
+                    'deprecated and will be removed in a future release')
     try:
         namespace = 'ceilometer.compute.virt'
         mgr = driver.DriverManager(namespace,
diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py
index 31adaacc73..bcb8bdb81e 100644
--- a/ceilometer/compute/virt/xenapi/inspector.py
+++ b/ceilometer/compute/virt/xenapi/inspector.py
@@ -30,12 +30,21 @@ opt_group = cfg.OptGroup(name='xenapi',
 
 OPTS = [
     cfg.StrOpt('connection_url',
+               deprecated_for_removal=True,
+               deprecated_reason='Support for XenServer/Xen Cloud Platform '
+                                 'has been deprecated',
                help='URL for connection to XenServer/Xen Cloud Platform.'),
     cfg.StrOpt('connection_username',
                default='root',
+               deprecated_for_removal=True,
+               deprecated_reason='Support for XenServer/Xen Cloud Platform '
+                                 'has been deprecated',
                help='Username for connection to XenServer/Xen Cloud '
                     'Platform.'),
     cfg.StrOpt('connection_password',
+               deprecated_for_removal=True,
+               deprecated_reason='Support for XenServer/Xen Cloud Platform '
+                                 'has been deprecated',
                help='Password for connection to XenServer/Xen Cloud Platform.',
                secret=True),
 ]
diff --git a/releasenotes/notes/deprecate-xen-support-27600e2bf7be548c.yaml b/releasenotes/notes/deprecate-xen-support-27600e2bf7be548c.yaml
new file mode 100644
index 0000000000..99d4d49f74
--- /dev/null
+++ b/releasenotes/notes/deprecate-xen-support-27600e2bf7be548c.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Support for XenServer/Xen Cloud Platform has been deprecated and will be
+    removed in a future release.