Sandro Bonazzola has uploaded a new change for review. Change subject: Renamed engine-iso-uploader in ovirt-iso-uploader ......................................................................
Renamed engine-iso-uploader in ovirt-iso-uploader The package should have the same name of the application. In this case, the package name seems better than the application name, so I've renamed the application instead of the package. Change-Id: I5f6cc47a3e068a62d6e8bdcd20f360e1d2a53c1c Signed-off-by: Sandro Bonazzola <[email protected]> --- M configure.ac M ovirt-iso-uploader.spec.in M src/Makefile.am M src/__main__.py R src/ovirt-iso-uploader.8 5 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-iso-uploader refs/changes/33/14133/1 diff --git a/configure.ac b/configure.ac index d83e361..9b6b6b2 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_SUBST([PACKAGE_RPM_RELEASE]) AC_CONFIG_AUX_DIR([.]) -AC_CONFIG_SRCDIR([src/engine-iso-uploader.8]) +AC_CONFIG_SRCDIR([src/ovirt-iso-uploader.8]) AC_CONFIG_MACRO_DIR([m4]) AC_USE_SYSTEM_EXTENSIONS AM_INIT_AUTOMAKE diff --git a/ovirt-iso-uploader.spec.in b/ovirt-iso-uploader.spec.in index edb0a3d..02f097a 100644 --- a/ovirt-iso-uploader.spec.in +++ b/ovirt-iso-uploader.spec.in @@ -56,7 +56,7 @@ %config(noreplace) %{_sysconfdir}/ovirt-engine/isouploader.conf %{_sysconfdir}/ovirt-engine/isouploader.conf.d/.keep %{python_sitelib}/ovirt_iso_uploader/*.py* -%{_bindir}/engine-iso-uploader +%{_bindir}/ovirt-iso-uploader %{_mandir}/man8/* %changelog diff --git a/src/Makefile.am b/src/Makefile.am index 6689410..9913861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ $(NULL) dist_man_MANS = \ - engine-iso-uploader.8 \ + ovirt-iso-uploader.8 \ $(NULL) dist_engineconfig_DATA = \ @@ -54,8 +54,8 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(bindir)" chmod a+x "$(DESTDIR)$(ovirtisouploaderlibdir)/__main__.py" - rm -f "$(DESTDIR)$(bindir)/engine-iso-uploader" - $(LN_S) "$(ovirtisouploaderlibdir)/__main__.py" "$(DESTDIR)$(bindir)/engine-iso-uploader" + rm -f "$(DESTDIR)$(bindir)/ovirt-iso-uploader" + $(LN_S) "$(ovirtisouploaderlibdir)/__main__.py" "$(DESTDIR)$(bindir)/ovirt-iso-uploader" uninstall-hook: - rm -f "$(DESTDIR)$(bindir)/engine-iso-uploader" + rm -f "$(DESTDIR)$(bindir)/ovirt-iso-uploader" diff --git a/src/__main__.py b/src/__main__.py index 3b67f69..8c683ea 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -59,7 +59,7 @@ CHMOD = '/bin/chmod' TEST = '/usr/bin/test' DEFAULT_CONFIGURATION_FILE = '/etc/ovirt-engine/isouploader.conf' -DEFAULT_LOG_FILE = '/var/log/ovirt-engine/engine-iso-uploader.log' +DEFAULT_LOG_FILE = '/var/log/ovirt-engine/ovirt-iso-uploader.log' PERMS_MASK = '640' PYTHON = '/usr/bin/python' diff --git a/src/engine-iso-uploader.8 b/src/ovirt-iso-uploader.8 similarity index 64% rename from src/engine-iso-uploader.8 rename to src/ovirt-iso-uploader.8 index fe6b9bd..7aa3678 100644 --- a/src/engine-iso-uploader.8 +++ b/src/ovirt-iso-uploader.8 @@ -1,18 +1,18 @@ -.\" engine-iso-uploader - oVirt Engine Tool for Uploading ISO Images -.TH "engine-iso-uploader" "8" "" "Keith Robertson" "" +.\" ovirt-iso-uploader - oVirt Engine Tool for Uploading ISO Images +.TH "ovirt-iso-uploader" "8" "" "Keith Robertson" "" .SH "NAME" -engine\-iso\-uploader \- oVirt Enterprise Virtualization Engine Manager ISO Uploader +ovirt\-iso\-uploader \- oVirt Enterprise Virtualization Engine Manager ISO Uploader .SH "SYNOPSIS" -\fBengine\-iso\-uploader\fP [options] list +\fBovirt\-iso\-uploader\fP [options] list .PP -\fBengine\-iso\-uploader\fP [options] upload [file]... +\fBovirt\-iso\-uploader\fP [options] upload [file]... .SH "DESCRIPTION" .PP -The \fBengine\-iso\-uploader\fP can be used to list the names of ISO storage domains (not the images stored in those domains) and upload files to storage domains. The upload operation supports multiple files (separated by spaces) and wildcarding.\& +The \fBovirt\-iso\-uploader\fP can be used to list the names of ISO storage domains (not the images stored in those domains) and upload files to storage domains. The upload operation supports multiple files (separated by spaces) and wildcarding.\& .PP -The \fBengine\-iso\-uploader\fP will, by default, attempt to interact with the REST API. This command typically gets the oVirt engine manager's hostname and port number (engine=) and user name (user=) from the \fB/etc/engine/logcollector.conf\fP file. Alternatively, you can provide the user name and password from the command line. The user name and password are authenticated by the authentication service associated with the oVirt engine manager. Currently, a special local account (admin), Red Hat IPA server, and Microsoft Active Directory server is supported for this task. +The \fBovirt\-iso\-uploader\fP will, by default, attempt to interact with the REST API. This command typically gets the oVirt engine manager's hostname and port number (engine=) and user name (user=) from the \fB/etc/engine/logcollector.conf\fP file. Alternatively, you can provide the user name and password from the command line. The user name and password are authenticated by the authentication service associated with the oVirt engine manager. Currently, a special local account (admin), Red Hat IPA server, and Microsoft Active Directory server is supported for this task. .PP -The reason \fBengine\-iso\-uploader\fP needs to interact with the REST API is so it can discover metadata (the IP address and path information) for the NFS server hosting the ISO storage domain. The only way to bypass the REST API (and not require a user name and password) is if you provide the fully qualified address and path to the NFS server. This can be useful if JBoss is off\-line or if you know the full path to the domain on the NFS server. However, keep in mind that the path names are not intuitive. You cannot bypass the REST API if you are using SSH to copy files to the server.\& +The reason \fBovirt\-iso\-uploader\fP needs to interact with the REST API is so it can discover metadata (the IP address and path information) for the NFS server hosting the ISO storage domain. The only way to bypass the REST API (and not require a user name and password) is if you provide the fully qualified address and path to the NFS server. This can be useful if JBoss is off\-line or if you know the full path to the domain on the NFS server. However, keep in mind that the path names are not intuitive. You cannot bypass the REST API if you are using SSH to copy files to the server.\& .PP The default transport is NFS. However, you can use SSH as the transport instead.\& .PP @@ -25,7 +25,7 @@ .IP "\fB\-\-quiet\fP" Intended to be used with \fBupload\fP operations to reduce console output (default=False).\& .IP "\fB\-\-log\-file=PATH\fP" -Path to engine\-iso\-uploader log file (default=/var/log/engine\-iso\-uploader.log).\& +Path to ovirt\-iso\-uploader log file (default=/var/log/ovirt\-iso\-uploader.log).\& .IP "\fB\-\-config\-file=PATH\fP" Path to the configuration file (default=/etc/engine/isouploader.conf).\& .IP "\fB\-v, \-\-verbose\fP" @@ -53,9 +53,9 @@ .IP "\fB\-k KEYFILE, \-\-key\-file=KEYFILE\fP" The identity file (private key) to be used for accessing the file server. If an identity file is not supplied, the program prompts for a password. It is strongly recommended to use key based authentication with SSH because the program may make multiple SSH connections, resulting in multiple requests for the SSH password.\& .SH "EXAMPLES" -Using the default local oVirt engine manager and ISO Domain, there are simple ways to run \fBengine\-iso\-uploader\fP to work with the ISO images associated with the oVirt engine manager. To list the names of your ISO domains, just add the \fBlist\fP option, then provide the username and password, when prompted:\& +Using the default local oVirt engine manager and ISO Domain, there are simple ways to run \fBovirt\-iso\-uploader\fP to work with the ISO images associated with the oVirt engine manager. To list the names of your ISO domains, just add the \fBlist\fP option, then provide the username and password, when prompted:\& .PP -# \fBengine\-iso\-uploader\fP list +# \fBovirt\-iso\-uploader\fP list .br Please provide the REST API username for oVirt Engine (CTRL+D to abort): \fBadmin@internal\fP .br @@ -70,32 +70,32 @@ .PP To upload an ISO image (for example, abc.iso), you could use the following command:\& .PP -# \fBengine\-iso\-uploader\fP \-\-iso\-domain=ISO upload /mnt/stuff/abc.iso +# \fBovirt\-iso\-uploader\fP \-\-iso\-domain=ISO upload /mnt/stuff/abc.iso .PP This next example uploads a file to the domain named ISO, indicating the username, name of the ISO domain (ISO), location of the oVirt engine manager (192.168.0.1) and the user name (root) used by the ssh command to transfer the files (/tmp/files/*.vfd).\& .PP -# \fBengine\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ +# \fBovirt\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ \-r 192.168.0.1 \-\-ssh\-user=root upload /tmp/files/*.vfd .PP If the files you are uploading currently exist in the ISO domain, you can force the old ones to be overwritten using the \fB\-\-force\fP option:\& .PP -# \fBengine\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ +# \fBovirt\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ \-r 192.168.0.1 \-\-ssh\-user=root \-\-force upload /tmp/files/*.vfd .PP If you don't use \fB\-\-force\fP and files you are uploading already exist on the server, you'll see messages that look like the following:\& .PP -# \fBengine\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ +# \fBovirt\-iso\-uploader\fP \-u [email protected] \-\-iso\-domain=ISO \\ \-r 192.168.0.1 \-\-ssh\-user=root upload /tmp/files/*.vfd .br ERROR: /tmp/files/a.vfd exists on 192.168.0.1. Either remove it or supply the --force option to overwrite it. .PP If you know the full path to the NFS upload directory, you may specify that. Note that no password is required: .PP -# \fBengine-iso-uploader\fP -u [email protected] \\ +# \fBovirt-iso-uploader\fP -u [email protected] \\ --nfs-server=192.168.0.1:/virt/iso/a0b9ecf0-6bed-4a64-8d2f-85b7dea3ab31/images/11111111-1111-1111-1111-111111111111 \\ upload /tmp/files/*.vfd .SH "CONFIGURATION FILE" -For configuration information, \fBengine\-iso\-uploader\fP always first pulls in any options set in the \fB/etc/engine/isouploader.conf\fP configuration file. By default, all options are commented out. Any options you set in that file can later be overridden from the \fBengine\-iso\-uploader\fP command line. To set defaults for any of the options described in this man page, uncomment the option lines you want in this file and add the desired values. Here are examples of a few lines from that file:\& +For configuration information, \fBovirt\-iso\-uploader\fP always first pulls in any options set in the \fB/etc/engine/isouploader.conf\fP configuration file. By default, all options are commented out. Any options you set in that file can later be overridden from the \fBovirt\-iso\-uploader\fP command line. To set defaults for any of the options described in this man page, uncomment the option lines you want in this file and add the desired values. Here are examples of a few lines from that file:\& .PP [ISOUploader]\& .br @@ -127,7 +127,7 @@ .SH "FILES" .nf /etc/engine/isouploader.conf\& -/var/log/engine-iso-uploader.log\& +/var/log/ovirt-iso-uploader.log\& .fi .SH "SEE ALSO" .SH "AUTHOR" -- To view, visit http://gerrit.ovirt.org/14133 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f6cc47a3e068a62d6e8bdcd20f360e1d2a53c1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-iso-uploader Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
