mooli tayer has uploaded a new change for review. Change subject: aaa: remove AdminDomain definition. ......................................................................
aaa: remove AdminDomain definition. This option became redundant with introduction of auth profiles. It was never exposed (Engine Config). Change-Id: I375df1489ed59d98a7be0e3d629b662a0d764d10 Topic: AAA Signed-off-by: Mooli Tayer <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties 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, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/30016/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties b/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties index 6ad57da..77abaf7 100644 --- a/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties +++ b/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties @@ -12,5 +12,4 @@ config.MaxLDAPQueryPartsNumber=100 config.LDAPOperationTimeout=30 config.LdapQueryPageSize=1000 -config.AdminDomain="" config.JAASLoginContext=oVirtKerb 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 c8ec2d3..6b48897 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 @@ -849,10 +849,6 @@ AdminUser, @TypeConverterAttribute(String.class) - @DefaultValueAttribute("internal") - AdminDomain, - - @TypeConverterAttribute(String.class) @DefaultValueAttribute("") @OptionBehaviourAttribute(behaviour = OptionBehaviour.Password) AdminPassword, diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 3c05e85..e3855c9 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -1075,6 +1075,7 @@ select fn_db_delete_config_value('NumberOfVmsForTopSizeVms','general'); select fn_db_delete_config_value_all_versions('EmulatedMachine'); select fn_db_delete_config_value_all_versions('ENGINEEARLib'); +SELECT fn_db_delete_config_value_all_versions('AdminDomain'); select fn_db_delete_config_value('AverageToPeakRatio','general'); select fn_db_delete_config_value('AverageToBurstRatio','general'); select fn_db_delete_config_value('DocsURL','general'); -- To view, visit http://gerrit.ovirt.org/30016 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I375df1489ed59d98a7be0e3d629b662a0d764d10 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: mooli tayer <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
