Frank Kobzik has uploaded a new change for review. Change subject: core: RNG fixes ......................................................................
core: RNG fixes 1, Reset rng sources of default cluster to NO sources (centos/rhel hosts don't support rng passthrough). 2, Adjust user filtering of GetRngDeviceQuery (now it should work in both Webadmin and Userportal). Change-Id: I0bf6715daba3f1f7121d636fef3fa1240301f452 Signed-off-by: Frantisek Kobzik <[email protected]> Bug-Url: https://bugzilla.redhat.com/1123385 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRngDeviceQuery.java A packaging/dbscripts/upgrade/03_05_0810_reset_rng_sources.sql 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/30911/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRngDeviceQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRngDeviceQuery.java index 74de7d4..9d9c873 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRngDeviceQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRngDeviceQuery.java @@ -27,7 +27,7 @@ VmDeviceGeneralType.RNG, VmDeviceType.VIRTIO.getName(), getUserID(), - true); + getParameters().isFiltered()); if (vmDevices != null && !vmDevices.isEmpty()) { VmDevice dev = vmDevices.get(0); diff --git a/packaging/dbscripts/upgrade/03_05_0810_reset_rng_sources.sql b/packaging/dbscripts/upgrade/03_05_0810_reset_rng_sources.sql new file mode 100644 index 0000000..e65758a --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0810_reset_rng_sources.sql @@ -0,0 +1,5 @@ +-- rng sources required by cluster +UPDATE vds_groups SET required_rng_sources = '' +WHERE cast(compatibility_version as float) <= 3.5 + AND cast (vds_group_id as text) = (select option_value from vdc_options where option_name = 'AutoRegistrationDefaultVdsGroupID'); + -- To view, visit http://gerrit.ovirt.org/30911 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bf6715daba3f1f7121d636fef3fa1240301f452 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
