Daniel Erez has uploaded a new change for review.
Change subject: core: osinfo properties - added 3.4 values
......................................................................
core: osinfo properties - added 3.4 values
Since 3.4 cluster version has been recently introduced,
appropriate values should be manually added explicitly.
Note: this is a temporary solution until the implementation
of cluster versions inheritance in OsInfo infrastructure.
Change-Id: Ib4b2d3b3eb14d368814392cfcb63e6c8648d05cc
Signed-off-by: Daniel Erez <[email protected]>
---
M packaging/conf/osinfo-defaults.properties
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/23340/1
diff --git a/packaging/conf/osinfo-defaults.properties
b/packaging/conf/osinfo-defaults.properties
index 3d666f6..649feb6 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -66,6 +66,7 @@
os.other.devices.cdInterface.value = ide
os.other.devices.diskInterfaces.value = IDE, VirtIO
os.other.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO
+os.other.devices.diskInterfaces.value.3.4 = IDE, VirtIO_SCSI, VirtIO
# 26 PCI slots: 31 total minus 5 saved for qemu (Host Bridge, ISA Bridge,
# IDE, Agent, ACPI)
os.other.devices.maxPciDevices.value = 26
@@ -83,6 +84,7 @@
os.rhel_3.derivedFrom.value = other_linux
os.rhel_3.devices.audio.value = ac97
os.rhel_3.devices.diskInterfaces.value.3.3 = IDE, VirtIO
+os.rhel_3.devices.diskInterfaces.value.3.4 = IDE, VirtIO
# rhel3x64(15, OsType.Linux, true),
os.rhel_3x64.id.value = 15
@@ -90,7 +92,7 @@
os.rhel_3x64.derivedFrom.value = other_linux
os.rhel_3x64.devices.audio.value = ac97
os.rhel_3x64.devices.diskInterfaces.value.3.3 = IDE, VirtIO
-
+os.rhel_3x64.devices.diskInterfaces.value.3.4 = IDE, VirtIO
# rhel4(8, OsType.Linux, false),
os.rhel_4.id.value = 8
@@ -119,6 +121,7 @@
os.rhel_6.derivedFrom.value = rhel_5
os.rhel_6.devices.audio.value = ich6
os.rhel_6.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO
+os.rhel_6.devices.diskInterfaces.value.3.4 = IDE, VirtIO_SCSI, VirtIO
# rhel6x64(19, OsType.Linux, true),
os.rhel_6x64.id.value = 19
@@ -126,6 +129,7 @@
os.rhel_6x64.derivedFrom.value = rhel_5x64
os.rhel_6x64.devices.audio.value = ich6
os.rhel_6x64.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO
+os.rhel_6x64.devices.diskInterfaces.value.3.4 = IDE, VirtIO_SCSI, VirtIO
# WindowsXP(1, OsType.Windows, false),
os.windows_xp.id.value = 1
@@ -137,6 +141,7 @@
os.windows_xp.devices.network.value = rtl8139_pv, rtl8139, e1000, pv
os.windows_xp.devices.audio.value = ac97
os.windows_xp.devices.diskInterfaces.value.3.3 = IDE, VirtIO
+os.windows_xp.devices.diskInterfaces.value.3.4 = IDE, VirtIO
os.windows_xp.family.value = windows
@@ -150,6 +155,7 @@
os.windows_2003.isTimezoneTypeInteger.value = true
os.windows_2003.devices.audio.value = ac97
os.windows_2003.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO
+os.windows_2003.devices.diskInterfaces.value.3.4 = IDE, VirtIO_SCSI, VirtIO
# Windows2008(4, OsType.Windows, false),
@@ -177,6 +183,7 @@
os.windows_7.productKey.value =
os.windows_7.devices.audio.value = ich6
os.windows_7.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO
+os.windows_7.devices.diskInterfaces.value.3.4 = IDE, VirtIO_SCSI, VirtIO
# Windows7x64(12, OsType.Windows, true),
os.windows_7x64.id.value = 12
@@ -261,8 +268,11 @@
os.other_ppc64.devices.network.value = pv, spaprVlan, e1000, rtl8139
os.other_ppc64.devices.cdInterface.value = scsi
os.other_ppc64.devices.diskInterfaces.value.3.3 = VirtIO, VirtIO_SCSI,
SPAPR_VSCSI
+os.other_ppc64.devices.diskInterfaces.value.3.4 = VirtIO, VirtIO_SCSI,
SPAPR_VSCSI
os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.3 = VirtIO_SCSI,
SPAPR_VSCSI
+os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.4 = VirtIO_SCSI,
SPAPR_VSCSI
os.other_ppc64.devices.network.hotplugSupport.value.3.3 = false
+os.other_ppc64.devices.network.hotplugSupport.value.3.4 = false
os.other_ppc64.devices.display.protocols.value = vnc/vga
os.other_ppc64.devices.watchdog.models.value = i6300esb
# In the ppc64 architecture there are only three devices occupying
--
To view, visit http://gerrit.ovirt.org/23340
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4b2d3b3eb14d368814392cfcb63e6c8648d05cc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
