Martin Peřina has uploaded a new change for review. Change subject: tools: Removes -interactive option from engine-manage-domains ......................................................................
tools: Removes -interactive option from engine-manage-domains Removes -interactive option from engine-manage-domains. If -passwordFile option is not set, then the password will be read interactively. Change-Id: I9bd764a50f6e6d237bc65d6e7a72ac2cc636786a Bug-Url: https://bugzilla.redhat.com/904029 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java M packaging/bin/engine-manage-domains.sh M packaging/man/man8/engine-manage-domains.8 3 files changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/23838/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index 08c8a9a..fa38951 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -93,7 +93,6 @@ configFile, propertiesFile, report, - interactive, addPermissions, provider, forceDelete, @@ -378,7 +377,7 @@ if (pass == null) { throw new ManageDomainsResult(ManageDomainsResultEnum.EMPTY_PASSWORD_FILE); } - } else if (parser.hasArg(Arguments.interactive.name())) { + } else { pass = readPasswordInteractively(); } @@ -1102,7 +1101,6 @@ } if (actionType.equals(ActionType.add)) { requireArgs(parser, Arguments.domain, Arguments.user, Arguments.provider); - requireAtLeastOneArg(parser, Arguments.passwordFile, Arguments.interactive); requireArgsValue(parser, Arguments.domain, Arguments.user, Arguments.provider, Arguments.passwordFile); checkInvalidArgs(parser, @@ -1122,14 +1120,12 @@ Arguments.domain, Arguments.user, Arguments.passwordFile, - Arguments.interactive, Arguments.forceDelete); } else if (actionType.equals(ActionType.list)) { checkInvalidArgs(parser, Arguments.domain, Arguments.user, Arguments.passwordFile, - Arguments.interactive, Arguments.forceDelete); } } else { diff --git a/packaging/bin/engine-manage-domains.sh b/packaging/bin/engine-manage-domains.sh index 8519e21..b35e32f 100755 --- a/packaging/bin/engine-manage-domains.sh +++ b/packaging/bin/engine-manage-domains.sh @@ -11,14 +11,13 @@ cat << __EOF__ engine-manage-domains: add/edit/delete/validate/list domains USAGE: - engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -interactive -configFile=PATH -addPermissions -forceDelete -ldapServers=LDAP_SERVERS -changePasswordUrl] -report + engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -configFile=PATH -addPermissions -forceDelete -ldapServers=LDAP_SERVERS -changePasswordUrl -report] Where: ACTION action to perform (add/edit/delete/validate/list). See details below. DOMAIN (mandatory for add, edit and delete) the domain you wish to perform the action on. PROVIDER (mandatory for add, optional for edit) the LDAP provider type of server used for the domain. Among the supported providers IPA, RHDS, ITDS, ActiveDirectory and OpenLDAP. USER (optional for edit, mandatory for add) the domain user. - PASSWORD_FILE (optional for edit, mandatory for add) a file containing the password in the first line. - interactive alternative for using -passwordFile - read the password interactively. + PASSWORD_FILE (optional for edit, mandatory for add) a file containing the password in the first line. If it's not set, the password will be read interactively PATH (optional) use the given alternate configuration file. LDAP_SERVERS (optional) a comma delimited list of LDAP servers to be set to the domain. CHANGE_PASSWORD_URL (optional) a URL to be returned to the user in case the password has expired. diff --git a/packaging/man/man8/engine-manage-domains.8 b/packaging/man/man8/engine-manage-domains.8 index fde0663..a270d7c 100644 --- a/packaging/man/man8/engine-manage-domains.8 +++ b/packaging/man/man8/engine-manage-domains.8 @@ -2,15 +2,14 @@ .SH NAME engine-manage-domains \- Engine management domains tool .SH SYNOPSIS -.B engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -interactive -configFile=PATH -addPermissions -forceDelete] -report +.B engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -configFile=PATH -addPermissions -forceDelete] -report Where: ACTION action to perform (add/edit/delete/validate/list). See details below. DOMAIN (mandatory for add, edit and delete) the domain you wish to perform the action on. PROVIDER (mandatory for add, optional for edit) the LDAP provider type of server used for the domain. Among the supported providers IPA,RHDS,ITDS,ActiveDirectory and OpenLDAP. USER (optional for edit, mandatory for add) the domain user. - PASSWORD_FILE (optional for edit, mandatory for add) a file containing the password in the first line. - interactive alternative for using -passwordFile - read the password interactively. + PASSWORD_FILE (optional for add, edit) a file containing the password in the first line. If it's not set, the password will be read interactively. PATH (optional) use the given alternate configuration file. Available actions: -- To view, visit http://gerrit.ovirt.org/23838 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bd764a50f6e6d237bc65d6e7a72ac2cc636786a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
