From 5489c4e28ee4d0cc3e1f7b4866a10a0d123e37ec Mon Sep 17 00:00:00 2001 From: Lucas Carvalho <lucas@nexedi.com> Date: Tue, 19 Jul 2011 17:16:30 +0200 Subject: [PATCH] Removed signature_public_file and renamed signature_private_file. Removed the argument signature_public_file because it should be inside the software profile under networkcache-section. And renamed signature_private_file to signature_private_key_file. --- slapos/grid/SlapObject.py | 8 +++----- slapos/grid/slapgrid.py | 22 ++++++++-------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/slapos/grid/SlapObject.py b/slapos/grid/SlapObject.py index a21f175b1..30899449d 100644 --- a/slapos/grid/SlapObject.py +++ b/slapos/grid/SlapObject.py @@ -48,7 +48,7 @@ REQUIRED_COMPUTER_PARTITION_PERMISSION = '0750' class Software(object): """This class is responsible of installing a software release""" def __init__(self, url, software_root, console, buildout, - signature_public_file, signature_private_file): + signature_private_key_file): """Initialisation of class parameters """ self.url = url @@ -58,8 +58,7 @@ class Software(object): self.buildout = buildout self.logger = logging.getLogger('BuildoutManager') self.console = console - self.signature_private_file = signature_private_file - self.signature_public_file = signature_public_file + self.signature_private_key_file = signature_private_key_file def install(self): """ Fetches buildout configuration from the server, run buildout with @@ -82,8 +81,7 @@ class Software(object): buildout_parameter_list = [ 'buildout:extends-cache=%s' % extends_cache, 'buildout:directory=%s' % self.software_path, - 'buildout:signature_public_file=%s' % self.signature_public_file, - 'buildout:signature_private_file=%s' % self.signature_private_file, + 'buildout:signature_private_key_file=%s' % self.signature_private_key_file, '-c', self.url] bootstrapBuildout(self.software_path, self.buildout, additional_buildout_parametr_list=buildout_parameter_list, diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py index 5078bd32e..ca5452156 100644 --- a/slapos/grid/slapgrid.py +++ b/slapos/grid/slapgrid.py @@ -97,8 +97,8 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): parser.add_argument("--key_file", help="SSL Authorisation key file.") parser.add_argument("--cert_file", help="SSL Authorisation certificate file.") - parser.add_argument("--signature_private_file", help="Private Key File.") - parser.add_argument("--signature_public_file", help="Public Key File.") + parser.add_argument("--signature_private_key_file", default='', + help="Signature private key file.") parser.add_argument("--master_ca_file", help="Root certificate of SlapOS " "master key.") parser.add_argument("--certificate_repository_path", @@ -166,11 +166,9 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): key_file = option_dict.get('key_file') cert_file = option_dict.get('cert_file') master_ca_file = option_dict.get('master_ca_file') - signature_private_file = option_dict.get('signature_private_file', '') - signature_public_file = option_dict.get('signature_public_file', '') + signature_private_key_file = option_dict.get('signature_private_key_file') - for f in [key_file, cert_file, master_ca_file, - signature_private_file, signature_public_file]: + for f in [key_file, cert_file, master_ca_file, signature_private_file]: if f not in ('', None,): if not os.path.exists(f): parser.error('File %r does not exists.' % f) @@ -201,8 +199,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): key_file=key_file, cert_file=cert_file, master_ca_file=master_ca_file, - signature_private_file=signature_private_file, - signature_public_file=signature_public_file, + signature_private_key_file=signature_private_key_file, certificate_repository_path=certificate_repository_path, console=option_dict['console'], buildout=option_dict.get('buildout')), @@ -272,8 +269,7 @@ class Slapgrid(object): buildout, key_file=None, cert_file=None, - signature_private_file=None, - signature_public_file=None, + signature_private_key_file=None, master_ca_file=None, certificate_repository_path=None, console=False): @@ -290,8 +286,7 @@ class Slapgrid(object): self.cert_file = cert_file self.master_ca_file = master_ca_file self.certificate_repository_path = certificate_repository_path - self.signature_private_file = signature_private_file - self.signature_public_file = signature_public_file + self.signature_private_key_file = signature_private_key_file # Configures logger self.logger = logging.getLogger('Slapgrid') # Creates objects from slap module @@ -364,8 +359,7 @@ class Slapgrid(object): software_release_uri = software_release.getURI() Software(url=software_release_uri, software_root=self.software_root, console=self.console, buildout=self.buildout, - signature_private_file=self.signature_private_file, - signature_public_file=self.signature_public_file).install() + signature_private_key_file=self.signature_private_key_file).install() except (SystemExit, KeyboardInterrupt): exception = traceback.format_exc() software_release.error(exception) -- 2.30.9