admin tools: Log IPA version

Add the IPA version, and vendor version if applicable, to the beginning
of admintool logs -- both framework and indivitual tools that don't yet
use the framework.
This will make debugging easier.

https://fedorahosted.org/freeipa/ticket/4219

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>

9 files changed, 9 insertions, 0 deletions

diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index 3af6936b0..9b54abdaa 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -217,6 +217,7 @@ def main():
 
     root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
     root_logger.debug("missing options might be asked for interactively later\n")
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     check_server_configuration()
 
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 26f6993a0..18c81dc1f 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -99,6 +99,7 @@ def main():
     standard_logging_setup(log_file_name, debug=options.debug)
 
     root_logger.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options))
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     if not ipautil.file_exists(filename):
         sys.exit("Replica file %s does not exist" % filename)
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index d87007d2f..78acc2d9b 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -80,6 +80,7 @@ def main():
 
     root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
     root_logger.debug("missing options might be asked for interactively later\n")
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     installutils.check_server_configuration()
 
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
index 2c92eb926..eafd37256 100755
--- a/install/tools/ipa-replica-conncheck
+++ b/install/tools/ipa-replica-conncheck
@@ -302,6 +302,7 @@ def main():
     logging_setup(options)
     root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
     root_logger.debug("missing options might be asked for interactively later\n")
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     signal.signal(signal.SIGTERM, sigterm_handler)
 
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index f5e7197b5..41c1a0533 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -455,6 +455,7 @@ def main():
 
     standard_logging_setup(log_file_name, debug=options.debug)
     root_logger.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options))
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     if not ipautil.file_exists(filename):
         sys.exit("Replica file %s does not exist" % filename)
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 34393b7df..232d84a2c 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -607,6 +607,7 @@ def main():
 
     root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
     root_logger.debug("missing options might be asked for interactively later\n")
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     global fstore
     fstore = sysrestore.FileStore(SYSRESTORE_DIR_PATH)
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index d77a33816..265d71c33 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -1014,6 +1014,7 @@ def main():
     standard_logging_setup('/var/log/ipaupgrade.log', debug=options.debug,
         verbose=verbose, console_format=console_format, filemode='a')
     root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')
 
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 6fd64d0d9..a547099f8 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -2856,6 +2856,7 @@ def main():
     root_logger.debug(
         '%s was invoked with options: %s', sys.argv[0], safe_options)
     root_logger.debug("missing options might be asked for interactively later")
+    root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
 
     env={"PATH":"/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"}
 
diff --git a/ipapython/admintool.py b/ipapython/admintool.py
index 5beed4a85..d55bd1849 100644
--- a/ipapython/admintool.py
+++ b/ipapython/admintool.py
@@ -283,6 +283,7 @@ class AdminTool(object):
         """
         self.log.debug('%s was invoked with arguments %s and options: %s',
                 self.command_name, self.args, self.safe_options)
+        self.log.debug('IPA version %s' % version.VENDOR_VERSION)
 
     def log_failure(self, error_message, return_value, exception, backtrace):
         self.log.debug(''.join(traceback.format_tb(backtrace)))