Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Fix sso for separate host ......................................................................
packaging: setup: Fix sso for separate host Change-Id: I3e21448eedc78ce40018748719d23cd237928c51 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/reports/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py 2 files changed, 66 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/87/29887/1 diff --git a/packaging/setup/ovirt_engine_setup/reports/constants.py b/packaging/setup/ovirt_engine_setup/reports/constants.py index aa966b0..c59eae1 100644 --- a/packaging/setup/ovirt_engine_setup/reports/constants.py +++ b/packaging/setup/ovirt_engine_setup/reports/constants.py @@ -416,6 +416,15 @@ JBOSS_DEBUG_ADDRESS = 'OVESETUP_REPORTS_CONFIG/jbossDebugAddress' JBOSS_NEEDED = 'OVESETUP_REPORTS_CONFIG/jbossNeeded' + @osetupattrs( + answerfile=True, + summary=True, + description=_('Engine Host FQDN'), + postinstallfile=True, + ) + def ENGINE_FQDN(self): + return 'OVESETUP_REPORTS_CONFIG/engineFqdn' + @util.export @util.codegen diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py index 4184f9d..e93ca94 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py @@ -39,6 +39,57 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault( + oreportscons.ConfigEnv.ENGINE_FQDN, + None + ) + + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, + after=( + oreportscons.Stages.CORE_ENABLE, + ) + condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], + ) + def _customization(self): + if self.environment[oreportscons.EngineCoreEnv.ENABLE]: + self.environment[ + oreportscons.ConfigEnv.ENGINE_FQDN + ] = self.environment[osetupcons.ConfigEnv.FQDN] + else: + interactive = self.environment[ + oreportscons.ConfigEnv.ENGINE_FQDN + ] is None + validFQDN = False + while not validFQDN: + if interactive: + self.environment[ + oreportscons.ConfigEnv.ENGINE_FQDN + ] = self.dialog.queryString( + name='OVESETUP_REPORTS_ENGINE_FQDN', + note=_( + 'Fully qualified DNS name of the engine host: ' + ), + prompt=True, + ) + # TODO do some real validation - + # either syntactic/dns lookup/etc or just try to connect to it + validFQDN = self.environment[ + oreportscons.ConfigEnv.ENGINE_FQDN + ] != '' + if not validFQDN: + self.logger.error( + _('Host name is not valid: {error}').format( + error='Cannot be empty', + ), + ) + if not interactive: + break + + @plugin.event( stage=plugin.Stages.STAGE_MISC, condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], ) @@ -56,10 +107,13 @@ content=( 'sslInsecure = true\n' 'getSessionUserGetSessionUserServletURL = ' - 'https://localhost:%s/ovirt-engine/services' + 'https://{host}:{port}/ovirt-engine/services' '/get-session-user\n' - ) % ( - self.environment[ + ).format( + host=self.environment[oreportscons.ConfigEnv.ENGINE_FQDN], + # TODO - this should be customizable as well, but default + # works (443). + port=self.environment[ oengcommcons.ConfigEnv.PUBLIC_HTTPS_PORT ], ), -- To view, visit http://gerrit.ovirt.org/29887 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e21448eedc78ce40018748719d23cd237928c51 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
