Lior Vernia has uploaded a new change for review. Change subject: core: Have custom device properties include security groups ......................................................................
core: Have custom device properties include security groups It was somehow left out of d0d47186cedfe448629e2215e739ee6742b17b11 updating the configuration values to 3.6, and also the changes introduced in e24d0664cf32d6564f1e357d9bdef26a3e2d03e7 caused the configuration value not to be set on fresh installations. Change-Id: Idf34c06abc2347c20f7493d5e98177dfb82927d1 Bug-Url: https://bugzilla.redhat.com/1188655 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/37489/1 diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 7a7202c..6218f29 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -573,7 +573,9 @@ -- Device Custom Properties select fn_db_add_config_value_for_versions_up_to('SupportCustomDeviceProperties', 'false', '3.2'); -select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '', '3.6'); +select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '', '3.3'); +-- Allow to specify SecurityGroups property for vNICs, containing either an empty string or a list of one or more comma seperated UUIDs. +select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '3.6'); -- Network Custom Properties select fn_db_add_config_value_for_versions_up_to('NetworkCustomPropertiesSupported', 'false', '3.4'); @@ -828,9 +830,6 @@ -- disable retries for more predictable HA timing: select fn_db_update_default_config_value('vdsConnectionTimeout', '180', '2', 'general', false); select fn_db_update_default_config_value('vdsRetries', '3', '0', 'general', false); --- Allow to specify SecurityGroups property for vNICs, containing either an empty string or a list of one or more comma seperated UUIDs. -select fn_db_update_default_config_value('CustomDeviceProperties', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '3.4', false); -select fn_db_update_default_config_value('CustomDeviceProperties', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '3.5', false); -- Override existing configuration to TLSv1 if it is SSLv3 select fn_db_update_default_config_value('VdsmSSLProtocol','SSLv3','TLSv1','general', false); -- To view, visit http://gerrit.ovirt.org/37489 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf34c06abc2347c20f7493d5e98177dfb82927d1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
