Commit df764e0a authored by Jérome Perrin's avatar Jérome Perrin

Revert "core: Update certificates as late as possible"

This reverts commit 202a9bcd because it caused
some test failures.
parent e141fbb7
Pipeline #16806 failed with stage
in 0 seconds
...@@ -452,6 +452,7 @@ class Partition(object): ...@@ -452,6 +452,7 @@ class Partition(object):
self.partition_id + '.key') self.partition_id + '.key')
self.cert_file = os.path.join(certificate_repository_path, self.cert_file = os.path.join(certificate_repository_path,
self.partition_id + '.crt') self.partition_id + '.crt')
self._updateCertificate()
try: try:
self.retention_delay = float(retention_delay) self.retention_delay = float(retention_delay)
...@@ -484,9 +485,6 @@ class Partition(object): ...@@ -484,9 +485,6 @@ class Partition(object):
required=bytes2human(required))) required=bytes2human(required)))
def _updateCertificate(self): def _updateCertificate(self):
if getattr(self, "key_file", None) is None:
return
try: try:
partition_certificate = self.computer_partition.getCertificate() partition_certificate = self.computer_partition.getCertificate()
except NotFoundError: except NotFoundError:
......
...@@ -954,11 +954,9 @@ stderr_logfile_backups=1 ...@@ -954,11 +954,9 @@ stderr_logfile_backups=1
except PromiseError as e: except PromiseError as e:
self.logger.error(e) self.logger.error(e)
if partition_access_status is None or not status_error: if partition_access_status is None or not status_error:
local_partition._updateCertificate()
computer_partition.error(e, logger=self.logger) computer_partition.error(e, logger=self.logger)
else: else:
if partition_access_status is None or status_error: if partition_access_status is None or status_error:
local_partition._updateCertificate()
computer_partition.started() computer_partition.started()
def processPromise(self, computer_partition): def processPromise(self, computer_partition):
...@@ -1186,9 +1184,6 @@ stderr_logfile_backups=1 ...@@ -1186,9 +1184,6 @@ stderr_logfile_backups=1
self.logger.info(' Software path: %s' % software_path) self.logger.info(' Software path: %s' % software_path)
self.logger.info(' Instance path: %s' % instance_path) self.logger.info(' Instance path: %s' % instance_path)
# Update certifcate at late as possible
local_partition._updateCertificate()
# XXX this line breaks 37 tests # XXX this line breaks 37 tests
# self.logger.info(' Instance type: %s' % computer_partition.getType()) # self.logger.info(' Instance type: %s' % computer_partition.getType())
self.logger.info(' Instance status: %s' % computer_partition_state) self.logger.info(' Instance status: %s' % computer_partition_state)
...@@ -1793,7 +1788,6 @@ stderr_logfile_backups=1 ...@@ -1793,7 +1788,6 @@ stderr_logfile_backups=1
ipv4_global_network=self.ipv4_global_network, ipv4_global_network=self.ipv4_global_network,
) )
local_partition.stop() local_partition.stop()
local_partition._updateCertificate()
try: try:
computer_partition.stopped() computer_partition.stopped()
except (SystemExit, KeyboardInterrupt): except (SystemExit, KeyboardInterrupt):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment