Roy Golan has uploaded a new change for review. Change subject: core: update osinfo default values and remove clutter ......................................................................
core: update osinfo default values and remove clutter Instead of maintaining new versions just update the defaults Change-Id: I94ab8349e3c5d8908e7b623d125519b3f38d3976 Signed-off-by: Roy Golan <rgo...@redhat.com> --- M packaging/conf/osinfo-defaults.properties 1 file changed, 21 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/39077/1 diff --git a/packaging/conf/osinfo-defaults.properties b/packaging/conf/osinfo-defaults.properties index a46e89c..2137038 100644 --- a/packaging/conf/osinfo-defaults.properties +++ b/packaging/conf/osinfo-defaults.properties @@ -64,11 +64,10 @@ os.other.devices.network.hotplugSupport.value.3.0 = false 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 -os.other.devices.diskInterfaces.value.3.5 = IDE, VirtIO_SCSI, VirtIO -os.other.devices.diskInterfaces.value.3.6 = IDE, VirtIO_SCSI, VirtIO +os.other.devices.diskInterfaces.value = IDE, VirtIO_SCSI, VirtIO +os.other.devices.diskInterfaces.value.3.0 = IDE, VirtIO +os.other.devices.diskInterfaces.value.3.1 = IDE, VirtIO +os.other.devices.diskInterfaces.value.3.2 = IDE, VirtIO # 26 PCI slots: 31 total minus 5 saved for qemu (Host Bridge, ISA Bridge, # IDE, Agent, ACPI) @@ -91,20 +90,14 @@ os.rhel_3.name.value = Red Hat Enterprise Linux 3.x 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 -os.rhel_3.devices.diskInterfaces.value.3.5 = IDE, VirtIO -os.rhel_3.devices.diskInterfaces.value.3.6 = IDE, VirtIO +os.rhel_3.devices.diskInterfaces.value = IDE, VirtIO # rhel3x64(15, OsType.Linux, true), os.rhel_3x64.id.value = 15 os.rhel_3x64.name.value = Red Hat Enterprise Linux 3.x x64 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 -os.rhel_3x64.devices.diskInterfaces.value.3.5 = IDE, VirtIO -os.rhel_3x64.devices.diskInterfaces.value.3.6 = IDE, VirtIO +os.rhel_3x64.devices.diskInterfaces.value = IDE, VirtIO os.rhel_3x64.resources.maximum.ram.value = 131072 # rhel4(8, OsType.Linux, false), @@ -134,20 +127,20 @@ os.rhel_6.name.value = Red Hat Enterprise Linux 6.x 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 -os.rhel_6.devices.diskInterfaces.value.3.5 = IDE, VirtIO_SCSI, VirtIO -os.rhel_6.devices.diskInterfaces.value.3.6 = IDE, VirtIO_SCSI, VirtIO +os.rhel_6.devices.diskInterfaces.value = IDE, VirtIO_SCSI, VirtIO +os.rhel_6.devices.diskInterfaces.value.3.0 = IDE, VirtIO +os.rhel_6.devices.diskInterfaces.value.3.1 = IDE, VirtIO +os.rhel_6.devices.diskInterfaces.value.3.2 = IDE, VirtIO # rhel6x64(19, OsType.Linux, true), os.rhel_6x64.id.value = 19 os.rhel_6x64.name.value = Red Hat Enterprise Linux 6.x x64 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 -os.rhel_6x64.devices.diskInterfaces.value.3.5 = IDE, VirtIO_SCSI, VirtIO -os.rhel_6x64.devices.diskInterfaces.value.3.6 = IDE, VirtIO_SCSI, VirtIO +os.rhel_6x64.devices.diskInterfaces.value = IDE, VirtIO_SCSI, VirtIO +os.rhel_6x64.devices.diskInterfaces.value.3.0 = IDE, VirtIO +os.rhel_6x64.devices.diskInterfaces.value.3.1 = IDE, VirtIO +os.rhel_6x64.devices.diskInterfaces.value.3.2 = IDE, VirtIO os.rhel_6x64.resources.maximum.ram.value = 3145728 os.rhel_7x64.id.value = 24 @@ -165,10 +158,7 @@ os.windows_xp.isTimezoneTypeInteger.value = true os.windows_xp.devices.network.value = rtl8139_pv, rtl8139, e1000, pv, pciPassthrough 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.devices.diskInterfaces.value.3.5 = IDE, VirtIO -os.windows_xp.devices.diskInterfaces.value.3.6 = IDE, VirtIO +os.windows_xp.devices.diskInterfaces.value = IDE, VirtIO os.windows_xp.family.value = windows os.windows_xp.devices.hyperv.enabled.value = true @@ -182,10 +172,7 @@ os.windows_2003.productKey.value = 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 -os.windows_2003.devices.diskInterfaces.value.3.5 = IDE, VirtIO_SCSI, VirtIO -os.windows_2003.devices.diskInterfaces.value.3.6 = IDE, VirtIO_SCSI, VirtIO +os.windows_2003.devices.diskInterfaces.value = IDE, VirtIO_SCSI, VirtIO # Windows2008(4, OsType.Windows, false), @@ -216,10 +203,7 @@ os.windows_7.sysprepFileName.value = Unattend.xml 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 -os.windows_7.devices.diskInterfaces.value.3.5 = IDE, VirtIO_SCSI, VirtIO -os.windows_7.devices.diskInterfaces.value.3.6 = IDE, VirtIO_SCSI, VirtIO +os.windows_7.devices.diskInterfaces.value = IDE, VirtIO_SCSI, VirtIO os.windows_7.isTimezoneTypeInteger.value = false # Windows7x64(12, OsType.Windows, true), @@ -336,18 +320,9 @@ os.other_ppc64.devices.network.value = pv, spaprVlan, e1000, rtl8139, pciPassthrough os.other_ppc64.devices.cdInterface.value = scsi os.other_ppc64.devices.balloon.enabled.value = false -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.diskInterfaces.value.3.5 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.diskInterfaces.value.3.6 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.3 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.4 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.5 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.6 = VirtIO, VirtIO_SCSI, SPAPR_VSCSI -os.other_ppc64.devices.network.hotplugSupport.value.3.3 = true -os.other_ppc64.devices.network.hotplugSupport.value.3.4 = true -os.other_ppc64.devices.network.hotplugSupport.value.3.5 = true -os.other_ppc64.devices.network.hotplugSupport.value.3.6 = true +os.other_ppc64.devices.diskInterfaces.value = VirtIO, VirtIO_SCSI, SPAPR_VSCSI +os.other_ppc64.devices.disk.hotpluggableInterfaces.value = VirtIO, VirtIO_SCSI, SPAPR_VSCSI +os.other_ppc64.devices.network.hotplugSupport.value = true 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 @@ -374,10 +349,7 @@ os.sles_11_ppc64.name.value = SUSE Linux Enterprise Server 11 os.sles_11_ppc64.derivedFrom.value = other_linux_ppc64 os.sles_11_ppc64.devices.network.value = pv, spaprVlan, e1000, pciPassthrough -os.sles_11_ppc64.devices.diskInterfaces.value.3.3 = VirtIO, SPAPR_VSCSI -os.sles_11_ppc64.devices.diskInterfaces.value.3.4 = VirtIO, SPAPR_VSCSI -os.sles_11_ppc64.devices.diskInterfaces.value.3.5 = VirtIO, SPAPR_VSCSI -os.sles_11_ppc64.devices.diskInterfaces.value.3.6 = VirtIO, SPAPR_VSCSI +os.sles_11_ppc64.devices.diskInterfaces.value = VirtIO, SPAPR_VSCSI # Ubuntuppc64 os.ubuntu_14_04_ppc64.id.value = 1005 -- To view, visit https://gerrit.ovirt.org/39077 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94ab8349e3c5d8908e7b623d125519b3f38d3976 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
