Revert "New option on slapos configuration file: upload-authentication-file."

This reverts commit 25c34da5.

slapos/grid/slapgrid.py

@@ -172,8 +172,6 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
   # the configuration file.
   signature_private_key_file = option_dict.get('signature_private_key_file') \
                           or option_dict.get('signature-private-key-file')
-  upload_authentication_file = option_dict.get( \
-                                 'upload-authentication-file', None)
 
   for f in [key_file, cert_file, master_ca_file, signature_private_key_file]:
     if f not in ('', None,):
@@ -210,7 +208,6 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
             signature_private_key_file=signature_private_key_file,
             upload_cache_url=option_dict.get('upload-cache-url', None),
             upload_dir_url=option_dict.get('upload-dir-url', None),
-            upload_authentication_file=upload_authentication_file,
             console=option_dict['console'],
             buildout=option_dict.get('buildout')),
           option_dict])
@@ -282,7 +279,6 @@ class Slapgrid(object):
                signature_private_key_file=None,
                upload_cache_url=None,
                upload_dir_url=None,
-               upload_authentication_file=None,
                master_ca_file=None,
                certificate_repository_path=None,
                console=False):
@@ -302,7 +298,6 @@ class Slapgrid(object):
     self.signature_private_key_file = signature_private_key_file
     self.upload_cache_url = upload_cache_url
     self.upload_dir_url = upload_dir_url
-    self.upload_authentication_file = upload_authentication_file
     # Configures logger
     self.logger = logging.getLogger('Slapgrid')
     # Creates objects from slap module
@@ -377,9 +372,7 @@ class Slapgrid(object):
             console=self.console, buildout=self.buildout,
             signature_private_key_file=self.signature_private_key_file,
             upload_cache_url=self.upload_cache_url,
-            upload_dir_url=self.upload_dir_url,
-            upload_authentication_file=self.upload_authentication_file) \
-                .install()
+            upload_dir_url=self.upload_dir_url).install()
       except (SystemExit, KeyboardInterrupt):
         exception = traceback.format_exc()
         software_release.error(exception)