starlingx
/
distcloud
Code Issues Proposed changes

Don't enable https on subcloud when ca cert is installed 

Currently in a DC system, when a ssl_ca certificate is installed,
an incorrect checking in DC sysinv driver triggers https enabling
on subcloud. This change updated the checking so that the CA
certificate is installed but https remains unchanged on subcloud.

Test Plan:
PASS: In DC system with ssl_ca certificate, disable https and uninstall
      ssl_ca certificate on a subcloud. Wait until the ssl_ca
      certificate is synced to the subcloud again. Observe that https
      remains disabled on the subcloud.

Closes-Bug: 1980769
Signed-off-by: Andy Ning <andy.ning@windriver.com>
Change-Id: I136319c8d93eb39d97818924cb07d0d2a013adec
This commit is contained in:
Andy Ning 2022-07-05 15:05:49 -04:00
parent cca9a52b2c
commit 1dedb8aba4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distributedcloud/dccommon/drivers/openstack/sysinv_v1.py
View File

@ -530,7 +530,8 @@ class SysinvClient(base.DriverBase):
LOG.info("update_certificate from shared file {} {}".format(
signature, certificate_files))
if signature and signature.startswith(CERT_MODE_SSL):
if (signature and signature.startswith(CERT_MODE_SSL) and
not signature.startswith(CERT_MODE_SSL_CA)):
# ensure https is enabled
isystem = self.sysinv_client.isystem.list()[0]
https_enabled = isystem.capabilities.get('https_enabled', False)