Alon Bar-Lev has uploaded a new change for review. Change subject: bootstrap: use LocalConfig for engine http host and port ......................................................................
bootstrap: use LocalConfig for engine http host and port This retires the VdcBootStrapUrl, PublicURLPort vdc_options in favour of the new configuration method. Change-Id: I01cd66cd83356c4dbaa0bae35ed0fe83c7c00852 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/tools/engine-config/src/main/resources/engine-config.properties M packaging/fedora/setup/engine-setup.py 5 files changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/9368/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 5887cf0..3331e88 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -392,7 +392,6 @@ select fn_db_add_config_value('ProductKeyWindow7','','general'); select fn_db_add_config_value('ProductKeyWindow7x64','','general'); select fn_db_add_config_value('ProductRPMVersion','3.0.0.0','general'); -select fn_db_add_config_value('PublicURLPort','8700','general'); select fn_db_add_config_value('QuotaGraceStorage','20','general'); select fn_db_add_config_value('QuotaGraceVdsGroup','20','general'); select fn_db_add_config_value('QuotaThresholdStorage','80','general'); @@ -512,7 +511,6 @@ select fn_db_add_config_value('ValidNumOfMonitors','1,2,4','general'); select fn_db_add_config_value('VcpuConsumptionPercentage','10','general'); --Handling Host Installation Bootstrap Script URL -select fn_db_add_config_value('VdcBootStrapUrl','http://example.com/engine/vds_scripts','general'); select fn_db_add_config_value('VdcVersion','3.0.0.0','general'); select fn_db_add_config_value('VDSAttemptsToResetCount','2','general'); select fn_db_add_config_value('VdsCertificateValidityInYears','5','general'); @@ -655,10 +653,12 @@ select fn_db_delete_config_value('LdapServers','3.0'); select fn_db_delete_config_value('NetConsolePort','general'); select fn_db_delete_config_value('PredefinedVMProperties','general'); +select fn_db_delete_config_value('PublicURLPort','general'); select fn_db_delete_config_value('RpmsRepositoryUrl','general'); select fn_db_delete_config_value('SysPrep3.0Path','general'); select fn_db_delete_config_value('UseENGINERepositoryRPMs','general'); select fn_db_delete_config_value('HotPlugSupportedOsList','general'); +select fn_db_delete_config_value('VdcBootStrapUrl','general'); select fn_db_delete_config_value('VdsErrorsFileName','general'); select fn_db_delete_config_value('VM64BitMaxMemorySizeInMB','general'); select fn_db_delete_config_value('LogVdsRegistration','general'); @@ -679,11 +679,6 @@ -- update keys from internal version 2.3 to official 3.0` update vdc_options set version = '3.0' where version = '2.3'; - --- update bootstrap path - -update vdc_options set option_value = replace (option_value , '/4/6', '') -where option_name = 'VdcBootStrapUrl'; ------------------------------------------------------------------------------------ -- complex updates using a temporary function section diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java index bbb96c7..99456a1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java @@ -24,6 +24,7 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.VdsGroupDAO; import org.ovirt.engine.core.utils.FileUtil; +import org.ovirt.engine.core.utils.LocalConfig; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.VdcException; import org.ovirt.engine.core.utils.archivers.tar.CachedTar; @@ -170,20 +171,27 @@ protected String InitInitialCommand(VDS vds, String initialCommand) { initialCommand = initialCommand.replace("{vds-server}", vds.gethost_name()); - initialCommand = initialCommand.replace("{URL1}", Config.<String> GetValue(ConfigValues.VdcBootStrapUrl)); + initialCommand = initialCommand.replace( + "{URL1}", + String.format( + "http://%1$s:%2$s/Components/vds/";, + LocalConfig.getInstance().getHost(), + LocalConfig.getInstance().getExternalHttpPort() + ) + ); initialCommand = initialCommand.replace("{GUID}", _fileGuid.toString()); initialCommand = initialCommand.replace("{server_SSL_enabled}", Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers).toString()); initialCommand = initialCommand.replace("{OrganizationName}", HandleOrganizationNameString(Config.<String> GetValue(ConfigValues.OrganizationName))); initialCommand = initialCommand.replace("{management_port}", (Integer.toString(vds.getport()))); - - String publicUrlPort = Config.<String> GetValue(ConfigValues.PublicURLPort); - if (StringUtils.isEmpty(publicUrlPort)) { - initialCommand = initialCommand.replace("{EnginePort}", ""); - } else { - initialCommand = initialCommand.replace("{EnginePort}", String.format("-p %1$s", publicUrlPort)); - } + initialCommand = initialCommand.replace( + "{EnginePort}", + String.format( + "-p %1$s", + LocalConfig.getInstance().getExternalHttpsPort() + ) + ); initialCommand = initialCommand.replace("{SSHKey}", _remoteSSHKey); initialCommand = initialCommand.replace("{OverrideFirewall}", isOverrideFirewallAllowed() ? 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 d1d65b1..6a46b74 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 @@ -373,6 +373,7 @@ @TypeConverterAttribute(String.class) @DefaultValueAttribute("") LicenseCertificateFingerPrint(105), + @Deprecated @TypeConverterAttribute(String.class) @DefaultValueAttribute("") VdcBootStrapUrl(106), @@ -870,6 +871,7 @@ @DefaultValueAttribute("1") CertAlias(265), + @Deprecated @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("8700") diff --git a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties index 68b4ad2..0e119d6 100644 --- a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties +++ b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties @@ -156,7 +156,6 @@ UtilizationThresholdInPercent.type=Integer ValidNumOfMonitors.description="Valid Numbers of Monitors" ValidNumOfMonitors.type=Integer -VdcBootStrapUrl.description="Host Installation Bootstrap Script URL" VdcVersion.description="oVirt Engine Version" VDSAttemptsToResetCount.description="Number of attempts to communicate with Host before trying to reset" VDSAttemptsToResetCount.type=Integer diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index f0a7a9c..d9d4c0d 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -1075,7 +1075,6 @@ "SSLEnabled":[ "true", 'text'], "UseSecureConnectionWithServers":[ "true", 'text'], "ScriptsPath":["/usr/share/ovirt-engine", 'text'], - "VdcBootStrapUrl":["http://"; + controller.CONF["HOST_FQDN"] + ":" + controller.CONF["HTTP_PORT"] + "/Components/vds/", 'text'], "AsyncPollingCyclesBeforeCallbackCleanup":["30", 'text'], "SysPrepXPPath":["/etc/ovirt-engine/sysprep/sysprep.xp", 'text'], "SysPrep2K3Path":["/etc/ovirt-engine/sysprep/sysprep.2k3", 'text'], @@ -1089,7 +1088,6 @@ "ConfigDir":["/etc/ovirt-engine", 'text'], "DataDir":["/usr/share/ovirt-engine", 'text'], "SignScriptName":["SignReq.sh", 'text'], - "PublicURLPort":[controller.CONF["HTTP_PORT"], 'text'], "OrganizationName":[controller.CONF["ORG_NAME"], 'text'], "ProductRPMVersion":[utils.getRpmVersion(basedefs.ENGINE_RPM_NAME), 'text'], "AdminPassword":[controller.CONF["AUTH_PASS"], 'pass'] -- To view, visit http://gerrit.ovirt.org/9368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01cd66cd83356c4dbaa0bae35ed0fe83c7c00852 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
