From d749b341602497b12d7bd56a28d99297840e0805 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Tue, 3 Mar 2020 16:33:54 +0100
Subject: [PATCH] Add deprecation notes to vmware/xenserver/hyperv guides
The support of vmware, xenserver and hyperv was deprecated.
Change-Id: Id06770c2247ce242f1fc2ac7220bbe6c3070598d
---
doc/source/reference/compute/hyperv-guide.rst | 4 ++++
doc/source/reference/compute/index.rst | 5 +++++
doc/source/reference/compute/nova-guide.rst | 12 ++++++++++++
doc/source/reference/compute/vmware-guide.rst | 4 ++++
doc/source/reference/compute/xenserver-guide.rst | 4 ++++
etc/kolla/globals.yml | 9 +++++++++
6 files changed, 38 insertions(+)
diff --git a/doc/source/reference/compute/hyperv-guide.rst b/doc/source/reference/compute/hyperv-guide.rst
index ae4e21802..ec6266732 100644
--- a/doc/source/reference/compute/hyperv-guide.rst
+++ b/doc/source/reference/compute/hyperv-guide.rst
@@ -4,6 +4,10 @@
Nova HyperV
===========
+.. note::
+
+ Hyper-V support has been deprecated and will be removed in the Victoria cycle.
+
Overview
~~~~~~~~
Currently, Kolla can deploy the following OpenStack services for Hyper-V:
diff --git a/doc/source/reference/compute/index.rst b/doc/source/reference/compute/index.rst
index 8f84634de..05e2de1ad 100644
--- a/doc/source/reference/compute/index.rst
+++ b/doc/source/reference/compute/index.rst
@@ -5,6 +5,11 @@ Compute
This section describes configuring nova hypervisors and
compute services like HyperV, XenServer and so on.
+.. note::
+
+ Hyper-V, VMware, and XenAPI support have 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 bd064b6ca..58558a6bb 100644
--- a/doc/source/reference/compute/nova-guide.rst
+++ b/doc/source/reference/compute/nova-guide.rst
@@ -19,6 +19,10 @@ The virtualisation driver may be selected via ``nova_compute_virt_type`` in
HyperV
------
+.. note::
+
+ Hyper-V support has been deprecated and will be removed in the Victoria cycle.
+
Information on using Nova with HyperV can be found in :doc:`hyperv-guide`.
Libvirt
@@ -30,12 +34,20 @@ 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`.
XenServer
---------
+.. note::
+
+ XenAPI support has been deprecated and will be removed in the Victoria cycle.
+
Information on the XenServer-based driver ``xenapi`` can be found in
:doc:`xenserver-guide`.
diff --git a/doc/source/reference/compute/vmware-guide.rst b/doc/source/reference/compute/vmware-guide.rst
index a205593b1..1beeac598 100644
--- a/doc/source/reference/compute/vmware-guide.rst
+++ b/doc/source/reference/compute/vmware-guide.rst
@@ -4,6 +4,10 @@
VMware - Nova Virtualisation Driver
===================================
+.. note::
+
+ VMware support has been deprecated and will be removed in the Victoria cycle.
+
Overview
~~~~~~~~
diff --git a/doc/source/reference/compute/xenserver-guide.rst b/doc/source/reference/compute/xenserver-guide.rst
index dfe3f4f71..2d5f26cd3 100644
--- a/doc/source/reference/compute/xenserver-guide.rst
+++ b/doc/source/reference/compute/xenserver-guide.rst
@@ -4,6 +4,10 @@
XenServer - Nova Virtualisation Driver
======================================
+.. note::
+
+ XenAPI 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 b1e67d540..9e435b8d6 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -521,6 +521,9 @@
#################
# Hyper-V options
#################
+
+# NOTE: Hyper-V support has been deprecated and will be removed in the Victoria cycle.
+
# Hyper-V can be used as hypervisor
#hyperv_username: "user"
#hyperv_password: "password"
@@ -606,6 +609,9 @@
###################################
# 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:
@@ -616,6 +622,9 @@
#######################################
# XenAPI - Support XenAPI for XenServer
#######################################
+
+# NOTE: XenAPI support has been deprecated and will be removed in the Victoria cycle.
+
# XenAPI driver use HIMN(Host Internal Management Network)
# to communicate with XenServer host.
#xenserver_himn_ip:
--
GitLab