packaging: setup: Refine the condition on _closeup_engine_grafana_acc…

…ess (#44) A recent patch added support for upgrading to keycloak, removing the condition about env[NEW_DATABASE]. This breaks upgrade on a separate machine. Fix, by copying parts of the condition on _misc_grafana_config. I hope that's enough. Bug-Url: https://bugzilla.redhat.com/2113980 Change-Id: Ie92bd44c93f1662ddf2eae025940699e75bc70ba Signed-off-by: Yedidyah Bar David <[email protected]>
oVirt · Aug 3, 2022 · ec82941 · ec82941
1 parent cfb8001
commit ec82941
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/core/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-grafana-dwh/core/config.py
@@ -391,7 +391,14 @@ def _misc_engine_grafana_access(self):
         ),
         condition=lambda self: (
             self.environment[ogdwhcons.CoreEnv.ENABLE] and
-            not self.environment[oenginecons.CoreEnv.ENABLE]
+            not self.environment[oenginecons.CoreEnv.ENABLE] and
+            (
+                self.environment[ogdwhcons.ConfigEnv.NEW_DATABASE] or
+                (
+                    self.environment[oengcommcons.KeycloakEnv.ENABLE] and
+                    not self.environment[oengcommcons.KeycloakEnv.CONFIGURED]
+                )
+            )
         ),
     )
     def _closeup_engine_grafana_access(self):