equal
deleted
inserted
replaced
1 In-house patch to enable Solaris Zones specific vm_mode value for use by the |
1 In-house patch to enable Solaris Zones specific vm_mode value for use by the |
2 ImagePropertiesFilter scheduling filter. This patch has not yet been |
2 ImagePropertiesFilter scheduling filter. This patch has not yet been |
3 submitted upstream. |
3 submitted upstream. |
4 |
4 |
5 --- nova-2013.1.4/nova/compute/vm_mode.py.orig Thu Oct 17 11:25:43 2013 |
5 --- nova-2014.2.2/nova/compute/vm_mode.py.orig Thu Oct 17 11:25:43 2013 |
6 +++ nova-2013.1.4/nova/compute/vm_mode.py Tue Mar 4 23:59:38 2014 |
6 +++ nova-2014.2.2/nova/compute/vm_mode.py Tue Mar 4 23:59:38 2014 |
7 @@ -33,8 +33,9 @@ |
7 @@ -31,8 +31,9 @@ |
8 XEN = "xen" # Xen 3.0 paravirtualized |
8 XEN = "xen" # Xen 3.0 paravirtualized |
9 UML = "uml" # User Mode Linux paravirtualized |
9 UML = "uml" # User Mode Linux paravirtualized |
10 EXE = "exe" # Executables in containers |
10 EXE = "exe" # Executables in containers |
11 +SOL = "solariszones" # Solaris zones (non-global and kernel) |
11 +SOL = "solariszones" # Solaris zones (non-global and kernel) |
12 |
12 |