diff options
| author | Zuul <zuul@review.opendev.org> | 2021-02-22 12:50:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-02-22 12:50:55 +0000 |
| commit | f6c4287dbb64fbabd973c6ef101c592376fc2cf9 (patch) | |
| tree | a163e15ac01ac82e901bc01f5348bb6cc8b60157 | |
| parent | 52f198390e727f3bde41f57c4bbb828f9ed8cc49 (diff) | |
| parent | fd0a561bea956f1b62f6ca5a27e762cb76ad9a90 (diff) | |
| download | ceilometer-16.0.0.0rc1.tar.gz | |
Merge "Deprecate support for Xen"16.0.0.0rc116.0.0
| -rw-r--r-- | ceilometer/compute/virt/inspector.py | 5 | ||||
| -rw-r--r-- | ceilometer/compute/virt/xenapi/inspector.py | 9 | ||||
| -rw-r--r-- | releasenotes/notes/deprecate-xen-support-27600e2bf7be548c.yaml | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py index 0ec9bc73..dbbc7281 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 31adaacc..bcb8bdb8 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 00000000..99d4d49f --- /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. |