author | Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM> |
Mon, 29 Aug 2016 22:44:12 -0700 | |
branch | s11u3-sru |
changeset 6709 | aea771e7a709 |
parent 6035 | c9748fcc32de |
child 6854 | 52081f923019 |
permissions | -rw-r--r-- |
6709
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
1 |
In-house patch to enable Solaris Zones and LDM specific vm_mode value for use by |
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
2 |
the ImagePropertiesFilter scheduling filter. This patch has not yet been |
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
submitted upstream. |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
5 |
--- nova-2015.1.2/nova/compute/vm_mode.py.~1~ 2015-10-13 07:52:35.000000000 -0700 |
6709
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
6 |
+++ nova-2015.1.2/nova/compute/vm_mode.py 2016-08-02 14:05:48.000830684 -0700 |
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
7 |
@@ -31,8 +31,10 @@ |
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
XEN = "xen" # Xen 3.0 paravirtualized |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
UML = "uml" # User Mode Linux paravirtualized |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
EXE = "exe" # Executables in containers |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+SOL = "solariszones" # Solaris zones (non-global and kernel) |
6709
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
12 |
+LDM = "ldoms" # Logical Domains (Oracle VM for SPARC) |
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
-ALL = [HVM, XEN, UML, EXE] |
6709
aea771e7a709
22585620 Nova/compute hvtype.py and vm_mode.py files to include 'ldoms' driver
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
6035
diff
changeset
|
15 |
+ALL = [HVM, XEN, UML, EXE, SOL, LDM] |
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
def get_from_instance(instance): |