Daniel Erez has uploaded a new change for review.

Change subject: core: osinfo properties - added 3.6 values
......................................................................

core: osinfo properties - added 3.6 values

As 3.6 cluster version has been recently introduced,
appropriate values should be manually added explicitly
(similar to Change-Id: I82acba49f080e9250481b0a62ac66817091a1755).

Note:
This should be a temporary solution until implementation
of cluster versions inheritance in OsInfo infrastructure;
covered by: https://bugzilla.redhat.com/show_bug.cgi?id=1056577.

Change-Id: Id2df0b1ae56e38d26613956581c084b18f16bb5e
Signed-off-by: Daniel Erez <[email protected]>
---
M packaging/conf/osinfo-defaults.properties
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/38493/1

diff --git a/packaging/conf/osinfo-defaults.properties 
b/packaging/conf/osinfo-defaults.properties
index c3dba2e..c8923e1 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -68,6 +68,7 @@
 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
 
 # 26 PCI slots: 31 total minus 5 saved for qemu (Host Bridge, ISA Bridge,
 # IDE, Agent, ACPI)
@@ -93,6 +94,7 @@
 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
 
 # rhel3x64(15, OsType.Linux, true),
 os.rhel_3x64.id.value = 15
@@ -102,6 +104,7 @@
 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.resources.maximum.ram.value = 131072
 
 # rhel4(8, OsType.Linux, false),
@@ -134,6 +137,7 @@
 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
 
 # rhel6x64(19, OsType.Linux, true),
 os.rhel_6x64.id.value = 19
@@ -143,6 +147,7 @@
 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.resources.maximum.ram.value = 3145728
 
 os.rhel_7x64.id.value = 24
@@ -163,6 +168,7 @@
 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.family.value = windows
 os.windows_xp.devices.hyperv.enabled.value = true
 
@@ -179,6 +185,7 @@
 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
 
 
 # Windows2008(4, OsType.Windows, false),
@@ -212,6 +219,7 @@
 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.isTimezoneTypeInteger.value = false
 
 # Windows7x64(12, OsType.Windows, true),
@@ -331,9 +339,11 @@
 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
@@ -366,6 +376,7 @@
 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
 
 # Ubuntuppc64
 os.ubuntu_14_04_ppc64.id.value = 1005


-- 
To view, visit https://gerrit.ovirt.org/38493
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2df0b1ae56e38d26613956581c084b18f16bb5e
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

Reply via email to