From 14afbe0ba42cad5bd5caf2999b73a947e8d02c7c Mon Sep 17 00:00:00 2001 From: Yedidyah Bar David Date: Tue, 23 Aug 2022 09:05:05 +0300 Subject: [PATCH] packaging: setup: Fix the call to ok_to_renew_cert ok_to_renew_cert now requires two more parameters - "short_life", which tells whether the cert's life should be (relatively) short (e.g. for a web server) or can be long (e.g. for engine<->hosts communications), and "environment", which is used to check the value of CertExpirationWarnPeriodInDays (the "long" life one). Please note, that the use, there, of environment[ENGINE_DB_ENV_KEYS], breaks us if grafana is set up separately from both the engine and dwh. The documentation currently tells to configure grafana either on the engine machine or on the dwh machine (if they are separate), but nothing thus far prevented configuring it on a third machine. This will now break. Change-Id: I274917c7452c42bc3f3f05446677154852f847e1 Signed-off-by: Yedidyah Bar David --- .../ovirt-engine-setup/ovirt-engine-grafana-dwh/pki/apache.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/pki/apache.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/pki/apache.py index 6284a497..d757a9fc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/pki/apache.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/pki/apache.py @@ -105,7 +105,9 @@ def _customization_needed(self): oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT ), 'apache', - True + True, + True, + self.environment, ): renew = dialog.queryBoolean( dialog=self.dialog,