Simone Tiraboschi has uploaded a new change for review. Change subject: man page: Adding undocumented options to the man page ......................................................................
man page: Adding undocumented options to the man page Completing the man page and the help text to coherently document all the command line options Change-Id: I43f1e4a3e9a82bc1e907a1362d5f54ed3dc041a1 Bug-Url: https://bugzilla.redhat.com/951097 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> --- M src/__main__.py M src/engine-image-uploader.8 2 files changed, 25 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-image-uploader refs/changes/85/26785/1 diff --git a/src/__main__.py b/src/__main__.py index d8c064c..8e9aa0f 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -2044,26 +2044,8 @@ "path to configuration file (default=%s)" % DEFAULT_CONFIGURATION_FILE ), - metavar=_("PATH") - ) - - parser.add_option( - "", - "--cert-file", - dest="cert_file", - help="The CA certificate used to validate the engine" - " (default=/etc/pki/ovirt-engine/ca.pem).", - metavar="/etc/pki/ovirt-engine/ca.pem", - default="/etc/pki/ovirt-engine/ca.pem" - ) - - parser.add_option( - "", - "--insecure", - dest="insecure", - help="Do not make an attempt to verify the engine.", - action="store_true", - default=False + metavar=_("PATH"), + default=DEFAULT_CONFIGURATION_FILE ) parser.add_option( @@ -2127,6 +2109,25 @@ default="localhost:443" ) + engine_group.add_option( + "", + "--cert-file", + dest="cert_file", + help="The CA certificate used to validate engine identity" + " (default=/etc/pki/ovirt-engine/ca.pem).", + metavar=_("PATH"), + default="/etc/pki/ovirt-engine/ca.pem" + ) + + engine_group.add_option( + "", + "--insecure", + dest="insecure", + help="Do not make an attempt to verify the engine identity.", + action="store_true", + default=False + ) + export_group = OptionGroup( parser, _("Export Storage Domain Configuration"), diff --git a/src/engine-image-uploader.8 b/src/engine-image-uploader.8 index dc58527..a2c5a42 100644 --- a/src/engine-image-uploader.8 +++ b/src/engine-image-uploader.8 @@ -52,6 +52,10 @@ Indicates the user name to use with the oVirt Engine REST API. This should be in UPN format.\& .IP "\fB\-r engine.example.com, \-\-engine=engine.example.com\fP" Hostname or IP address of the oVirt Engine (default=localhost:443).\& +.IP "\fB\-\-cert\-file=PATH\fP" +Path to the CA certificate used to validate engine identity (default=/etc/pki/ovirt-engine/ca.pem).\& +.IP "\fB\-\-insecure\fP" +Do not make an attempt to verify the engine identity (default=False).\& .SH "EXPORT STORAGE DOMAIN CONFIGURATION OPTIONS" Options in this group specify the export storage domain to which OVF files should be uploaded.\& .IP "\fB\-e EXPORT_STORAGE_DOMAIN, \-\-export\-domain=EXPORT_STORAGE_DOMAIN\fP" -- To view, visit http://gerrit.ovirt.org/26785 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43f1e4a3e9a82bc1e907a1362d5f54ed3dc041a1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-image-uploader Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
