From b2bcbc4b1cec23aba5f2b7cfa60ce03739355eb8 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 8 Nov 2017 14:55:45 +1100
Subject: [PATCH] Remove incomplete xen support

Support for the Xen hypervisor within the charm is incomplete
and untested.  Remove Xen support and update comment to clarify
supported virt flavors.

Change-Id: I6fb87fb5eb40ad48315b563471ec4f08e7d907ce
---
 README.md                             |  4 ++--
 config.yaml                           | 12 ++++++++----
 hooks/nova_compute_utils.py           |  4 ----
 unit_tests/test_nova_compute_utils.py |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 29466fef..90aa66b7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 Overview
 ========
 
-This charm provides Nova Compute, the OpenStack compute service. It's target
-platform is Ubuntu (preferably LTS) + Openstack.
+This charm provides Nova Compute, the OpenStack compute service. Its target
+platform is Ubuntu (preferably LTS) + OpenStack.
 
 Usage
 =====
diff --git a/config.yaml b/config.yaml
index f4eaf824..597ba52f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -97,10 +97,14 @@ options:
     type: string
     default: kvm
     description: |
-      Virtualization flavor. Supported flavors are: kvm, xen, uml, lxc, qemu,
-      lxd.
-      .
-      NOTE: Changing virtualization flavor after deployment is not supported.
+      Virtualisation flavor. Supported and tested flavors are: kvm, lxd.
+
+      If using the lxd flavor, the lxd subordinate charm must also be related.
+
+      Other native libvirt flavors available to exercise (dev/test only):
+      uml, lxc, qemu.
+
+      NOTE: Changing virtualisation flavor after deployment is not supported.
   disk-cachemodes:
     type: string
     default:
diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index 254f2889..cd2e4722 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -163,7 +163,6 @@ LATE_GIT_PACKAGES = [
     'qemu-system',
     'qemu-utils',
     'vlan',
-    'xen-system-amd64',
 ]
 
 # ubuntu packages that should not be installed when deploying from git
@@ -179,7 +178,6 @@ GIT_PACKAGE_BLACKLIST = [
     'nova-compute-lxd',
     'nova-compute-qemu',
     'nova-compute-uml',
-    'nova-compute-xen',
     'nova-network',
     'python-six',
     'quantum-plugin-openvswitch',
@@ -290,7 +288,6 @@ CEPH_RESOURCES = {
 VIRT_TYPES = {
     'kvm': ['nova-compute-kvm'],
     'qemu': ['nova-compute-qemu'],
-    'xen': ['nova-compute-xen'],
     'uml': ['nova-compute-uml'],
     'lxc': ['nova-compute-lxc'],
     'lxd': ['nova-compute-lxd'],
@@ -300,7 +297,6 @@ VIRT_TYPES = {
 LIBVIRT_URIS = {
     'kvm': 'qemu:///system',
     'qemu': 'qemu:///system',
-    'xen': 'xen:///',
     'uml': 'uml:///system',
     'lxc': 'lxc:///',
 }
diff --git a/unit_tests/test_nova_compute_utils.py b/unit_tests/test_nova_compute_utils.py
index 2469d664..ea5e2a96 100644
--- a/unit_tests/test_nova_compute_utils.py
+++ b/unit_tests/test_nova_compute_utils.py
@@ -855,7 +855,7 @@ class NovaComputeUtilsTests(CharmTestCase):
              'dnsmasq-utils', 'ebtables', 'genisoimage', 'iptables',
              'iputils-arping', 'kpartx', 'kvm', 'netcat', 'open-iscsi',
              'parted', 'python-libvirt', 'qemu', 'qemu-system',
-             'qemu-utils', 'vlan', 'xen-system-amd64'], fatal=True)
+             'qemu-utils', 'vlan'], fatal=True)
 
     @patch('os.listdir')
     @patch('os.path.join')