openstack/charm-nova-compute
Code Issues Proposed changes

Remove incomplete xen support

Browse Source 
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
This commit is contained in:
Ryan Beisner 2017-11-08 14:55:45 +11:00
parent 764b11c6d1
commit b2bcbc4b1c
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,8 +1,8 @@
Overview Overview
======== ========
This charm provides Nova Compute, the OpenStack compute service. It's target This charm provides Nova Compute, the OpenStack compute service. Its target
platform is Ubuntu (preferably LTS) + Openstack. platform is Ubuntu (preferably LTS) + OpenStack.
Usage Usage
===== =====

12
config.yaml
View File

@ -97,10 +97,14 @@ options:
type: string type: string
default: kvm default: kvm
description: | description: |
Virtualization flavor. Supported flavors are: kvm, xen, uml, lxc, qemu, Virtualisation flavor. Supported and tested flavors are: kvm, lxd.
lxd.
. If using the lxd flavor, the lxd subordinate charm must also be related.
NOTE: Changing virtualization flavor after deployment is not supported.
Other native libvirt flavors available to exercise (dev/test only):
uml, lxc, qemu.
NOTE: Changing virtualisation flavor after deployment is not supported.
disk-cachemodes: disk-cachemodes:
type: string type: string
default: default:

4
hooks/nova_compute_utils.py
View File

@ -163,7 +163,6 @@ LATE_GIT_PACKAGES = [
'qemu-system', 'qemu-system',
'qemu-utils', 'qemu-utils',
'vlan', 'vlan',
'xen-system-amd64',
] ]
# ubuntu packages that should not be installed when deploying from git # ubuntu packages that should not be installed when deploying from git
@ -179,7 +178,6 @@ GIT_PACKAGE_BLACKLIST = [
'nova-compute-lxd', 'nova-compute-lxd',
'nova-compute-qemu', 'nova-compute-qemu',
'nova-compute-uml', 'nova-compute-uml',
'nova-compute-xen',
'nova-network', 'nova-network',
'python-six', 'python-six',
'quantum-plugin-openvswitch', 'quantum-plugin-openvswitch',
@ -290,7 +288,6 @@ CEPH_RESOURCES = {
VIRT_TYPES = { VIRT_TYPES = {
'kvm': ['nova-compute-kvm'], 'kvm': ['nova-compute-kvm'],
'qemu': ['nova-compute-qemu'], 'qemu': ['nova-compute-qemu'],
'xen': ['nova-compute-xen'],
'uml': ['nova-compute-uml'], 'uml': ['nova-compute-uml'],
'lxc': ['nova-compute-lxc'], 'lxc': ['nova-compute-lxc'],
'lxd': ['nova-compute-lxd'], 'lxd': ['nova-compute-lxd'],
@ -300,7 +297,6 @@ VIRT_TYPES = {
LIBVIRT_URIS = { LIBVIRT_URIS = {
'kvm': 'qemu:///system', 'kvm': 'qemu:///system',
'qemu': 'qemu:///system', 'qemu': 'qemu:///system',
'xen': 'xen:///',
'uml': 'uml:///system', 'uml': 'uml:///system',
'lxc': 'lxc:///', 'lxc': 'lxc:///',
} }

2
unit_tests/test_nova_compute_utils.py
View File

@ -855,7 +855,7 @@ class NovaComputeUtilsTests(CharmTestCase):
'dnsmasq-utils', 'ebtables', 'genisoimage', 'iptables', 'dnsmasq-utils', 'ebtables', 'genisoimage', 'iptables',
'iputils-arping', 'kpartx', 'kvm', 'netcat', 'open-iscsi', 'iputils-arping', 'kpartx', 'kvm', 'netcat', 'open-iscsi',
'parted', 'python-libvirt', 'qemu', 'qemu-system', 'parted', 'python-libvirt', 'qemu', 'qemu-system',
'qemu-utils', 'vlan', 'xen-system-amd64'], fatal=True) 'qemu-utils', 'vlan'], fatal=True)
@patch('os.listdir') @patch('os.listdir')
@patch('os.path.join') @patch('os.path.join')