Gustavo Frederico Temple Pedrosa has uploaded a new change for review.

Change subject: engine: Update osinfo file for ppc64 arch
......................................................................

engine: Update osinfo file for ppc64 arch

* This change remove the obsolete code of spice support (the majority
  obsolete code was removed in the change #18677 and replaced by
  "displayProtocols")
* Has been updated the properties of ppc64 architecture in the osinfo
  file (after the merged codes that add these properties for the x86
  architecture)

Change-Id: Ifd0594cc91f67220230189be59dfad7f2bc9f5a6
Signed-off-by: Gustavo Pedrosa <[email protected]>
---
M 
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
M packaging/conf/osinfo-defaults.properties
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/22596/1

diff --git 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
index 4d33530..e4705b2 100644
--- 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
+++ 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
@@ -40,7 +40,6 @@
         preferences.node("/os/rhel7/resources/minimum/ram").put("value", 
"1024");
         preferences.node("/os/rhel7/resources/minimum/ram").put("value.3.1", 
"512");
         preferences.node("/os/rhel7/resources/maximum/ram").put("value", 
"2048");
-        preferences.node("/os/rhel7/spiceSupport").put("value", "true");
         preferences.node("/os/rhel7/displayProtocols").put("value", 
"vnc/cirrus,qxl/qxl");
         preferences.node("/os/rhel7/sysprepPath").put("value", 
PATH_TO_SYSPREP);
         preferences.node("/os/rhel7/productKey").put("value", 
SOME_PRODUCT_KEY);
diff --git a/packaging/conf/osinfo-defaults.properties 
b/packaging/conf/osinfo-defaults.properties
index 7ec78d4..c3e8f5d 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -52,7 +52,6 @@
 os.other.resources.minimum.disksize.value = 1
 os.other.resources.minimum.numberOsCpus.value = 1
 os.other.displayProtocols.value = vnc/cirrus,qxl/qxl
-os.other.spiceSupport.value = true
 os.other.watchDogModels.value = i6300esb
 
 os.other.devices.disk.hotpluggableInterfaces.value = VirtIO_SCSI, VirtIO
@@ -254,11 +253,13 @@
 os.other_ppc64.derivedFrom.value = other
 os.other_ppc64.cpuArchitecture.value = ppc64
 os.other_ppc64.bus.value = 64
-os.other_ppc64.spiceSupport.value = false
-os.other_ppc64.devices.network.value = pv
-os.other_ppc64.devices.diskInterfaces.value = VirtIO, VirtIO_SCSI
-os.other_ppc64.devices.disk.hotpluggableInterfaces.value = VirtIO_SCSI
-os.other_ppc64.devices.network.hotplugSupport.value = false
+os.other_ppc64.devices.network.value = pv, spaprVlan, e1000, rtl8139
+os.other_ppc64.devices.diskInterfaces.value.3.3 = VirtIO, VirtIO_SCSI
+os.other_ppc64.devices.disk.hotpluggableInterfaces.value.3.3 = VirtIO_SCSI
+os.other_ppc64.devices.network.hotplugSupport.value.3.3 = false
+os.other_ppc64.displayProtocols.value = vnc/vga
+os.other_ppc64.watchDogModels.value = i6300esb
+
 
 # Backward Compatibility Section
 # Keep a mapping of the old os unique names to new od IDs


-- 
To view, visit http://gerrit.ovirt.org/22596
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd0594cc91f67220230189be59dfad7f2bc9f5a6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gustavo Frederico Temple Pedrosa <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to