fix tox and update encryption if storagecluster exists

Signed-off-by: fbalak <[email protected]>
red-hat-storage · Jun 12, 2024 · f5d393c · f5d393c
1 parent 4fd3be1
commit f5d393c
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/ocs_ci/deployment/provider_client/storage_client_deployment.py b/ocs_ci/deployment/provider_client/storage_client_deployment.py
@@ -196,15 +196,15 @@ def provider_and_native_client_installation(
                     constants.OCS_STORAGE_CLUSTER_YAML
                 )
                 if config.ENV_DATA.get("encryption_at_rest"):
-                    logger.info("Enabling encryption at REST!")
-                    cluster_data["spec"]["encryption"] = {
+                    log.info("Enabling encryption at REST!")
+                    storage_cluster_data["spec"]["encryption"] = {
                         "enable": True,
                     }
-                    cluster_data["spec"]["encryption"] = {
+                    storage_cluster_data["spec"]["encryption"] = {
                         "clusterWide": True,
                     }
                 if config.DEPLOYMENT.get("kms_deployment"):
-                    cluster_data["spec"]["encryption"]["kms"] = {
+                    storage_cluster_data["spec"]["encryption"]["kms"] = {
                         "enable": True,
                     }
                 templating.dump_data_to_temp_yaml(
@@ -217,6 +217,18 @@ def provider_and_native_client_installation(
                 storage_cluster_data = templating.load_yaml(
                     constants.OCS_STORAGE_CLUSTER_UPDATED_YAML
                 )
+                if config.ENV_DATA.get("encryption_at_rest"):
+                    log.info("Enabling encryption at REST!")
+                    storage_cluster_data["spec"]["encryption"] = {
+                        "enable": True,
+                    }
+                    storage_cluster_data["spec"]["encryption"] = {
+                        "clusterWide": True,
+                    }
+                if config.DEPLOYMENT.get("kms_deployment"):
+                    storage_cluster_data["spec"]["encryption"]["kms"] = {
+                        "enable": True,
+                    }
                 templating.dump_data_to_temp_yaml(
                     storage_cluster_data, constants.OCS_STORAGE_CLUSTER_UPDATED_YAML
                 )