--- a/components/openstack/nova/patches/01-Solaris-vm_mode.patch Mon Aug 08 11:30:01 2016 -0700
+++ b/components/openstack/nova/patches/01-Solaris-vm_mode.patch Mon Aug 08 14:20:59 2016 -0700
@@ -1,17 +1,18 @@
-In-house patch to enable Solaris Zones specific vm_mode value for use by the
-ImagePropertiesFilter scheduling filter. This patch has not yet been
+In-house patch to enable Solaris Zones and LDM specific vm_mode value for use by
+the ImagePropertiesFilter scheduling filter. This patch has not yet been
submitted upstream.
--- nova-2015.1.2/nova/compute/vm_mode.py.~1~ 2015-10-13 07:52:35.000000000 -0700
-+++ nova-2015.1.2/nova/compute/vm_mode.py 2015-12-31 20:11:22.020900882 -0800
-@@ -31,8 +31,9 @@ HVM = "hvm" # Native ABI (aka fully vir
++++ nova-2015.1.2/nova/compute/vm_mode.py 2016-08-02 14:05:48.000830684 -0700
+@@ -31,8 +31,10 @@
XEN = "xen" # Xen 3.0 paravirtualized
UML = "uml" # User Mode Linux paravirtualized
EXE = "exe" # Executables in containers
+SOL = "solariszones" # Solaris zones (non-global and kernel)
++LDM = "ldoms" # Logical Domains (Oracle VM for SPARC)
-ALL = [HVM, XEN, UML, EXE]
-+ALL = [HVM, XEN, UML, EXE, SOL]
++ALL = [HVM, XEN, UML, EXE, SOL, LDM]
def get_from_instance(instance):
--- a/components/openstack/nova/patches/04-compute-hvtype.patch Mon Aug 08 11:30:01 2016 -0700
+++ b/components/openstack/nova/patches/04-compute-hvtype.patch Mon Aug 08 14:20:59 2016 -0700
@@ -1,21 +1,23 @@
-In-house patch to add the 'solariszones' hypervisor to Nova's list of
-known hypervisors. This patch has not yet been submitted upstream.
+In-house patch to add the 'solariszones' and 'ldoms' hypervisor to Nova's list of
+known hypervisors. This patch has not yet been submitted upstream.
--- nova-2015.1.2/nova/compute/hv_type.py.~1~ 2015-10-13 07:52:44.000000000 -0700
-+++ nova-2015.1.2/nova/compute/hv_type.py 2015-12-31 19:56:40.193951927 -0800
-@@ -40,6 +40,7 @@ OPENVZ = "openvz"
++++ nova-2015.1.2/nova/compute/hv_type.py 2016-08-02 13:55:19.746264695 -0700
+@@ -40,6 +40,8 @@
PARALLELS = "parallels"
PHYP = "phyp"
QEMU = "qemu"
+SOLARISZONES = "solariszones"
++LDOMS = "ldoms"
TEST = "test"
UML = "uml"
VBOX = "vbox"
-@@ -61,6 +62,7 @@ ALL = (
+@@ -61,6 +63,8 @@
PARALLELS,
PHYP,
QEMU,
+ SOLARISZONES,
++ LDOMS,
TEST,
UML,
VBOX,