Tal Nisan has uploaded a new change for review. Change subject: core: Add config values for mixed domain types in data center ......................................................................
core: Add config values for mixed domain types in data center Change-Id: I9dd924bd1e53136fc5a1b6195700c7920658dde0 Bug-Url: https://bugzilla.redhat.com/1083560 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 3 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/26560/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java index fc531ce..8924469 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java @@ -239,4 +239,12 @@ return supportedInConfig(ConfigValues.ImportGlanceImageAsTemplate, version); } + /** + * @param version + * Compatibility version to check for. + * @return <code>true</code> if mixed domain type is supported for the given version. + */ + public static boolean mixedDomainTypesOnDataCenter(Version version) { + return supportedInConfig(ConfigValues.MixedDomainTypesInDataCenter, version); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 0d4fb8b..eb2c09e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1639,5 +1639,9 @@ @DefaultValueAttribute("true") ImportGlanceImageAsTemplate, + @TypeConverterAttribute(Boolean.class) + @DefaultValueAttribute("true") + MixedDomainTypesInDataCenter, + Invalid; } diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index e3f0acc..a3482db 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -219,6 +219,13 @@ select fn_db_add_config_value('DefaultRouteSupported','false','3.2'); select fn_db_add_config_value('DefaultRouteSupported','false','3.3'); +-- Mixed domain types in a data center support +select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.0'); +select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.1'); +select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.2'); +select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.3'); +select fn_db_add_config_value('MixedDomainTypesInDataCenter','true','3.4'); + -- by default use no proxy select fn_db_add_config_value('SpiceProxyDefault','','general'); -- To view, visit http://gerrit.ovirt.org/26560 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dd924bd1e53136fc5a1b6195700c7920658dde0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
