misc changes again

2 files changed, 2 insertions, 82 deletions

diff --git a/deploy-devstack b/deploy-devstack
index b49b4b0..763025a 100755
--- a/deploy-devstack
+++ b/deploy-devstack
@@ -2,6 +2,8 @@
 
 sudo apt-get install cloud-image-utils
 
+rm -rf devstack
+
 git clone https://git.openstack.org/openstack-dev/devstack
 
 pushd devstack
diff --git a/devstack-xen-support.patch b/devstack-xen-support.patch
deleted file mode 100644
index b0c40dd..0000000
--- a/devstack-xen-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From e0c311425dcf79c28d36ecc63e522d74ba9d8c1d Mon Sep 17 00:00:00 2001
-From: Clark Laughlin <clark.laughlin@linaro.org>
-Date: Wed, 26 Nov 2014 10:47:41 -0600
-Subject: [PATCH 1/1] xen support
-
----
- nova/virt/libvirt/blockinfo.py | 6 ++----
- nova/virt/libvirt/driver.py    | 8 ++++----
- nova/virt/libvirt/utils.py     | 7 +------
- 3 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py
-index 19be483..6424309 100644
---- a/nova/virt/libvirt/blockinfo.py
-+++ b/nova/virt/libvirt/blockinfo.py
-@@ -127,9 +127,7 @@ def get_dev_prefix_for_disk_bus(disk_bus):
-     elif disk_bus == "virtio":
-         return "vd"
-     elif disk_bus == "xen":
--        # Two possible mappings for Xen, xvda or sda
--        # which are interchangeable, so we pick sda
--        return "sd"
-+        return "xvd"
-     elif disk_bus == "scsi":
-         return "sd"
-     elif disk_bus == "usb":
-@@ -242,7 +240,7 @@ def get_disk_bus_for_device_type(virt_type,
-         return "lxc"
-     elif virt_type == "xen":
-         if device_type == "cdrom":
--            return "ide"
-+            return "xen"
-         elif device_type == "disk":
-             return "xen"
-     elif virt_type in ("qemu", "kvm"):
-diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
-index fa7bb8e..4f101ba 100644
---- a/nova/virt/libvirt/driver.py
-+++ b/nova/virt/libvirt/driver.py
-@@ -4046,9 +4046,9 @@ class LibvirtDriver(driver.ComputeDriver):
-             if guest.os_type == vm_mode.HVM:
-                 guest.os_loader = CONF.libvirt.xen_hvmloader_path
- 
--            # PAE only makes sense in X86
--            if caps.host.cpu.arch in (arch.I686, arch.X86_64):
--                guest.pae = True
-+#            # PAE only makes sense in X86
-+#            if caps.host.cpu.arch in (arch.I686, arch.X86_64):
-+#                guest.pae = True
- 
-         if virt_type in ("kvm", "qemu"):
-             if caps.host.cpu.arch in (arch.I686, arch.X86_64):
-@@ -4073,7 +4073,7 @@ class LibvirtDriver(driver.ComputeDriver):
-             else:
-                 guest.os_boot_dev = blockinfo.get_boot_order(disk_info)
- 
--        if virt_type not in ("lxc", "uml"):
-+        if virt_type not in ("lxc", "uml", "xen"):
-             guest.acpi = guest.apic = True
- 
-         # NOTE(mikal): Microsoft Windows expects the clock to be in
-diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
-index 487f454..94436d3 100644
---- a/nova/virt/libvirt/utils.py
-+++ b/nova/virt/libvirt/utils.py
-@@ -222,12 +222,7 @@ def pick_disk_driver_name(hypervisor_version, is_block_dev=False):
-         if is_block_dev:
-             return "phy"
-         else:
--            # 4000000 == 4.0.0
--            if hypervisor_version == 4000000:
--                return "tap"
--            else:
--                return "tap2"
--
-+            return None
-     elif CONF.libvirt.virt_type in ('kvm', 'qemu'):
-         return "qemu"
-     else:
--- 
-1.9.1
-