Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: rename: Use the Hostname class for new name ......................................................................
packaging: rename: Use the Hostname class for new name Change-Id: I22e5f41b138cd212ec2e951d66c175bddd6d3200 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/hostname.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py 2 files changed, 20 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/37304/1 diff --git a/packaging/setup/ovirt_engine_setup/hostname.py b/packaging/setup/ovirt_engine_setup/hostname.py index 48b95c8..6756785 100644 --- a/packaging/setup/ovirt_engine_setup/hostname.py +++ b/packaging/setup/ovirt_engine_setup/hostname.py @@ -306,21 +306,28 @@ ) ) - def getHostname(self, envkey, whichhost, supply_default): + def getHostname(self, envkey, whichhost, supply_default, prompttext=None): interactive = self.environment[envkey] is None validFQDN = False + if prompttext is None: + prompttext = _( + 'Host fully qualified DNS name of {whichhost} server' + ).format( + whichhost=whichhost, + ) while not validFQDN: if interactive: fqdn = socket.getfqdn() self.environment[ envkey ] = self.dialog.queryString( - name='OVESETUP_NETWORK_FQDN', + name='OVESETUP_NETWORK_FQDN_{whichhost}'.format( + whichhost=whichhost.replace(' ', '_'), + ), note=_( - 'Host fully qualified DNS name of ' - '{whichhost} server [@DEFAULT@]: ' + '{prompt} [@DEFAULT@]: ' ).format( - whichhost=whichhost, + prompt=prompt, ), prompt=True, default=fqdn if supply_default else '', diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py index 27e3391..9c53f0e 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py @@ -29,6 +29,7 @@ from ovirt_engine_setup import constants as osetupcons +from ovirt_engine_setup import hostname as osetuphostname @util.export @@ -85,15 +86,14 @@ if self.environment[ osetupcons.RenameEnv.FQDN ] is None: - self.environment[ - osetupcons.RenameEnv.FQDN - ] = self.dialog.queryString( - name='OVESETUP_RENAME_FQDN', - note=_('New fully qualified server name: '), - prompt=True, + osetuphostname.Hostname( + plugin=self, + ).getHostname( + envkey=osetupcons.RenameEnv.FQDN + whichhost=_('New'), + supply_default=False, + prompttext=_('New fully qualified server name: '), ) - # TODO validate host name syntax - # TODO check resolve? self.environment[osetupcons.ConfigEnv.FQDN] = self.environment[ osetupcons.RenameEnv.FQDN ] -- To view, visit http://gerrit.ovirt.org/37304 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22e5f41b138cd212ec2e951d66c175bddd6d3200 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
