Changeset 1239 for opsi

Timestamp:

Feb 28, 2018, 6:41:10 PM (7 years ago)

Author:

joergs

Message:

added createBareosConfigFiles

• try to allow alternatives to jsonrpc, however tests with jsonrpclib (jsonrpclib_pelix-0.3.1) have not been successful.
• createBareosConfigFiles
  • replaced createBaculaConfigFiles
  • provide default parameter for JobDefs and FileSet
  • store resulting files to correct location /etc/bareos/bareos-dir.d/*/opsi-*-generated.conf

Location:

opsi/server/dass-opsi-tools

Files:

• dass-opsi-tools.spec (modified) (1 diff)
• usr/bin/opsiclient (modified) (11 diffs)

opsi/server/dass-opsi-tools/dass-opsi-tools.spec

@@ -42 +42 @@
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin/
-#install -m 755 usr/bin/opsi-bacula-server-conf.py $RPM_BUILD_ROOT/usr/bin/
 install -m 755 usr/bin/opsiclient $RPM_BUILD_ROOT/usr/bin/
 #install -m 755 usr/bin/opsi-getDepots.py $RPM_BUILD_ROOT/usr/bin/

opsi/server/dass-opsi-tools/usr/bin/opsiclient

@@ -8 +8 @@
 
 __author__ = "Joerg Steffens"
-__copyright__ = "Copyright 2012-2017, dass IT GmbH"
+__copyright__ = "Copyright 2012-2018, dass IT GmbH"
 __license__ = "GPL"
 __version__ = "1.2"
@@ -21 +21 @@
 
 import argparse
-from datetime import datetime, timedelta
-from dateutil import parser as dateparser
-import jsonrpc
+from   datetime import datetime, timedelta
+from   dateutil import parser as dateparser
 import logging
 import os
-from pprint import pprint, pformat
+from   pprint import pprint, pformat
 import sys
+import ssl
 import time
 
+try:
+    import jsonrpc
+except ImportError:
+    import jsonrpclib
+
+
 UrlJsonRpc="https://<username>:<password>@opsi:4447/rpc"
 
-HelpEpilog="WARNING: python-json-rpc is known to have problems with HTTP proxies. In case of problems, make sure, the environment variables http_proxy and/or https_proxy are *not* set."
+HelpEpilog="WARNING: python-json-rpc is known to have problems with HTTP proxies. In case of problems, make sure, the environment variables http_proxy and/or https_proxy are *not* set. It might also be neccesary to set variable PYTHONHTTPSVERIFY=0"
 
 class Nrpe:
@@ -83 +89 @@
         self.nagios=nagios
         self.urlJsonRpc=urlJsonRpc
-        self.rpc=jsonrpc.ServiceProxy(self.urlJsonRpc)
+        if 'jsonrpc' in sys.modules:
+            self.rpc=jsonrpc.ServiceProxy(self.urlJsonRpc)
+        else:
+            self.rpc=jsonrpclib.ServerProxy(self.urlJsonRpc)
         self.logger.debug( "initialized: " + self.urlJsonRpc )
+        self.logger.debug(dir(self.rpc))
 
 
     def list(self):
+        exceptions = []
+        if 'jsonrpc' in sys.modules:
+            exceptions = [ jsonrpc.json.JSONDecodeException ]
         try:
             print( "\n".join( self.rpc.getClientIds_list() ) )
-        except jsonrpc.json.JSONDecodeException as e:
+        except exceptions as e:
             self.logger.debug( pformat(self.rpc.getClientIds_list()) )
             self.logger.exception( "failed" )
@@ -314 +327 @@
 
 
+
+    def write_value_conf(self, fd, key, properties, default=None):
+        value = None
+        comment = ''
+        try:
+            value = properties[key.lower()]
+        except KeyError:
+            pass
+        if not value and default:
+            value = default
+        if not value:
+            # prevent a None to be written
+            value = ''
+            comment = '# '
+        fd.write('  {}{} = "{}"\n'.format(comment, key, value))
+
+
+
     def write_client_conf( self, fd, client, properties ):
         #Client {
@@ -319 +350 @@
         #Address = ting.dass-it
         #FDPort = 9102
+        #Password = "D5w2V5w6B8a9H5Z"
         #Catalog = MyCatalog
-        #Password = "D5w2V5w6B8a9H5Z"
         #File Retention = 6 months
         #Job Retention = 6 months
         #AutoPrune = yes
         #}
-        params = [ "FDPort", "FileRetention", "JobRetention", "AutoPrune" ]
+        params = [ 'catalog', "FDPort", "FileRetention", "JobRetention", "AutoPrune" ]
         fd.write( "Client {\n" )
         fd.write( '  Name     = "' + properties['filedaemon_full_name'] + '"' + "\n" )
-        fd.write( '  Address  = "' + client['clientId'] + '"' + "\n" )
+        fd.write( '  Address  = "' + properties['filedaemon_client_address'] + '"' + "\n" )
         # ipAddress: method host_getObjects [] '{"id":client['clientId']}'
         #print("  # Address =", ipAddress)
         fd.write( '  Password = "' + properties['filedaemon_full_password'] + '"' + "\n" )
-        try:
-            catalog = properties['catalog']
-        except KeyError:
-            catalog = "MyCatalog"
-        fd.write( '  Catalog  = "' + catalog + '"' + "\n" )
         for i in params:
-            try:
-                fd.write( '  ' + i + ' = "' + properties[i.lower()] + '"' + "\n" )
-            except KeyError:
-                fd.write( '  # ' + i + " = \n" )
+            self.write_value_conf(fd, i, properties)
         fd.write( "}\n")
         fd.write( "\n" )
 
 
-    def write_job_conf( self, fd, client, properties ):
+    def write_job_conf(self, fd, client, properties, defaultjobdefs, defaultfileset):
         #Job {
         #FileSet = "tingfileset"
@@ -354 +377 @@
         ## Write Bootstrap = "/var/lib/bacula/ting.bsr"
         #}
-        params = [ "Fileset", "JobDefs" ]
+        params = [ "JobDefs", "FileSet" ]
         fd.write( "Job {" + "\n" )
         fd.write( '  Name    = "' + client['clientId'] + '-job"' + "\n" )
         fd.write( '  Client  = "' + properties['filedaemon_full_name'] + '"' + "\n" )
-        for i in params:
-            fd.write( "  " )
-            try:
-                if not properties[i.lower()]:
-                    fd.write( "# " )
-                fd.write( i + ' = "' + properties[i.lower()] + '"' + "\n" )
-            except KeyError:
-                fd.write( "# " + i + " = " + "\n" )
+        self.write_value_conf(fd, 'JobDefs', properties, defaultjobdefs)
+        self.write_value_conf(fd, 'FileSet', properties, defaultfileset)
         fd.write( "}" + "\n" )
         fd.write( "\n" )
@@ -381 +398 @@
 
 
-    def createBaculaConfigFiles( self ):
-        clientsWithBacula=self.getClientsWithProduct( "bacula" )
+
+    def createBareosConfigFiles(self, defaultjobdefs, defaultfileset):
+        bareosDirConfigPath = '/etc/bareos/bareos-dir.d/'
+        clientsWithBacula=self.getClientsWithProduct('winbareos')
         if clientsWithBacula:
             try:
-                file_opsi_clients = open('opsi-clients-generated.conf', 'w')
+                configfile = bareosDirConfigPath + 'client/opsi-clients-generated.conf'
+                file_opsi_clients = open(configfile, 'w')
                 self.write_config_file_header( file_opsi_clients )
-
-                file_opsi_jobs = open('opsi-jobs-generated.conf', 'w')
+            except (BaseException, IOError) as e:
+                self.logger.exception( "failed to create configuration file {}".format(configfile) )
+                return False
+
+            try:
+                configfile = bareosDirConfigPath + 'job/opsi-jobs-generated.conf'
+                file_opsi_jobs = open(configfile, 'w')
                 self.write_config_file_header( file_opsi_jobs )
-            except BaseException as e:
-                self.logger.exception( "failed to create files" )
+            except (BaseException, IOError) as e:
+                self.logger.exception( "failed to create configuration file {}".format(configfile) )
                 return False
+
             for client in clientsWithBacula:
                 clientId = client['clientId']
                 try:
-                    clientBaculaProperties=self.getClientProductProperty( clientId, "bacula" )
+                    clientBaculaProperties=self.getClientProductProperty( clientId, 'winbareos' )
                 except ValueError as e:
                     self.logger.warn( "%s: no valid information found: %s" %(clientId, e) )
@@ -402 +428 @@
                     if clientBaculaProperties:
                         #pprint( clientBaculaProperties )
-                        self.write_client_conf( file_opsi_clients, client, clientBaculaProperties )
-                        self.write_job_conf( file_opsi_jobs, client, clientBaculaProperties )
+                        self.write_client_conf(file_opsi_clients, client, clientBaculaProperties)
+                        self.write_job_conf(file_opsi_jobs, client, clientBaculaProperties, defaultjobdefs, defaultfileset)
                         self.logger.info( "%s: OK" % clientId )
                     else:
@@ -508 +534 @@
     logger.setLevel(logging.INFO)
     
-    parser = argparse.ArgumentParser(description='Command line tool for OPSI configuration.', epilog=HelpEpilog )
+    parser = argparse.ArgumentParser(
+        description='Command line tool for OPSI configuration.',
+        epilog=HelpEpilog
+    )
 
     parser.add_argument( '--debug', action='store_true', help="enable debugging output" )
@@ -538 +567 @@
     #parser_copy.add_argument( '--no-properties', action='store_false', help="don't copy product properties" )
 
-    parser_createBaculaConfigFiles = subparsers.add_parser('createBaculaConfigFiles', help='create Bacula config files for all clients that have bacula installed')
+    parser_createBareosConfigFiles = subparsers.add_parser(
+        'createBareosConfigFiles',
+        help='create Bareos config files for all clients that have winbareos installed',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+    parser_createBareosConfigFiles.add_argument(
+        '--defaultjobdefs',
+        metavar='JobDefs',
+        default='DefaultJob',
+        help="use this JobDefs if no other is defined for a client"
+    )
+    parser_createBareosConfigFiles.add_argument(
+        '--defaultfileset',
+        metavar='FileSet',
+        help="use this FileSet if no other is defined for a client"
+    )
 
     parser_exists = subparsers.add_parser('exists', help='check, if a opsi clients exists' )
@@ -595 +639 @@
         elif args.subcommand == "copy": 
             result = opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot )
-        elif args.subcommand == "createBaculaConfigFiles": 
-            result = opsi.createBaculaConfigFiles()
+        elif args.subcommand == "createBareosConfigFiles": 
+            result = opsi.createBareosConfigFiles(args.defaultjobdefs, args.defaultfileset)
         elif args.subcommand == "exists":
             result = opsi.exists( args.src )