Juan Hernandez has uploaded a new change for review. Change subject: engine: Remove ENGINEEARLib option ......................................................................
engine: Remove ENGINEEARLib option This option isn't used. Change-Id: Icf530e4b91a4d5dffc99b731c147e1815be693b8 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M packaging/conf/engine-config-install.properties M packaging/dbscripts/config_devel.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/fedora/setup/engine-setup.py M packaging/setup/plugins/ovirt-engine-setup/config/options.py 6 files changed, 1 insertion(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/16722/1 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 908156b..9302246 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 @@ -691,10 +691,6 @@ @DefaultValueAttribute("auth-conf") SASL_QOP(286), - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("%JBOSS_HOME%\\standalone\\deployments\\engine.ear") - ENGINEEarLib(287), - @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1000") @@ -1197,9 +1193,6 @@ @DefaultValueAttribute("true") SupportForceExtendVG(398), - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - ENGINEEARLib(399), @TypeConverterAttribute(String.class) @DefaultValueAttribute("") MinimalETLVersion(400), diff --git a/packaging/conf/engine-config-install.properties b/packaging/conf/engine-config-install.properties index 63f2a78..c11e4ef 100644 --- a/packaging/conf/engine-config-install.properties +++ b/packaging/conf/engine-config-install.properties @@ -3,7 +3,6 @@ OrganizationName= InstallVds= -ENGINEEARLib= ScriptsPath= UseSecureConnectionWithServers= VdsErrorsFileName= diff --git a/packaging/dbscripts/config_devel.sql b/packaging/dbscripts/config_devel.sql index 3b2b6b2..cd7be77 100644 --- a/packaging/dbscripts/config_devel.sql +++ b/packaging/dbscripts/config_devel.sql @@ -1,5 +1,4 @@ select fn_db_update_config_value('AdminPassword','letmein!','general'); -select fn_db_update_config_value('ENGINEEARLib','%JBOSS_HOME%/server/engine-slimmed/deploy/engine.ear','general'); select fn_db_update_config_value('InstallVds', 'false','general'); select fn_db_update_config_value('SSLEnabled', 'false','general'); select fn_db_update_config_value('SysPrep2K3Path','backend/manager/conf/sysprep/sysprep.2k3','general'); diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 82dcbb9..e9c1901 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -105,7 +105,6 @@ select fn_db_add_config_value('EnableUSBAsDefault','true','general'); --Handling Enables Host Load Balancing system. select fn_db_add_config_value('EnableVdsLoadBalancing','true','general'); -select fn_db_add_config_value('ENGINEEARLib','','general'); --Handling Engine working mode select fn_db_add_config_value('EngineMode','Active','general'); --Handling Use Default Credentials @@ -818,6 +817,7 @@ select fn_db_delete_config_value('DefaultTimeZone','general'); 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'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index cb3fa44..342e52d 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -1266,9 +1266,6 @@ #1st we update the keystore and CA related paths, only then we can set the passwords and the rest options options = ( { - "ENGINEEARLib":["%s/engine.ear" %(basedefs.DIR_ENGINE), 'text'], - }, - { "LocalAdminPassword":[controller.CONF["AUTH_PASS"], 'pass'], "SSLEnabled":[ "true", 'text'], "UseSecureConnectionWithServers":[ "true", 'text'], diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/config/options.py index c7caf3a..c2875eb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/options.py @@ -157,13 +157,6 @@ self.environment[osetupcons.DBEnv.STATEMENT].updateVdcOptions( options=[ { - 'name': 'ENGINEEARLib', - 'value': os.path.join( - osetupcons.FileLocations.DATADIR, - 'engine.ear', - ), - }, - { 'name': 'SSLEnabled', 'value': 'true', }, -- To view, visit http://gerrit.ovirt.org/16722 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf530e4b91a4d5dffc99b731c147e1815be693b8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
