From df634354a6cd79c93d1cb0dd984ae766c687834f Mon Sep 17 00:00:00 2001
From: Douglas Viroel <dviroel@redhat.com>
Date: Tue, 19 Jul 2022 09:30:02 -0300
Subject: [PATCH] Fixing condition for ceph custom parameters updates

By adding new ceph jobs that configure their own container
namespaces to run tests against different image tags, we started to
face some issues in standalone role, which has some conflicting
conditions on setting custom ceph parameters.
This patch tries to fix these conditions to make them easier to
use.

Change-Id: If108dc66f15333b7ba90fff980f320e06a21bbff
---
 roles/standalone/defaults/main.yml    | 2 +-
 roles/standalone/tasks/containers.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/standalone/defaults/main.yml b/roles/standalone/defaults/main.yml
index 6590f42df..3d896091c 100644
--- a/roles/standalone/defaults/main.yml
+++ b/roles/standalone/defaults/main.yml
@@ -51,7 +51,7 @@ local_registry_ip: 127.0.0.1
 local_registry_port: 5001
 
 # containers related params
-custom_ceph_parameters: "{{ job.consumer_job|default(false)|bool }}"
+custom_ceph_parameters: "{{ job.custom_ceph_parameters|default(false)|bool }}"
 custom_ceph_alertmanager_namespace: quay.io/prometheus
 custom_ceph_grafana_namespace: quay.io/app-sre
 custom_ceph_node_exporter_namespace: quay.io/prometheus
diff --git a/roles/standalone/tasks/containers.yml b/roles/standalone/tasks/containers.yml
index 0966dd6ab..2abdb3af3 100644
--- a/roles/standalone/tasks/containers.yml
+++ b/roles/standalone/tasks/containers.yml
@@ -139,7 +139,6 @@
 - name: update container custom ceph parameters, if required
   when:
     - custom_ceph_parameters|bool
-    - standalone_container_ceph_updates|bool
   replace:
     path: "{{ working_dir }}/containers-prepare-parameters.yaml"
     regexp: " {{ item.original }}: (.*)"
@@ -168,8 +167,8 @@
 # extra-common role.
 - name: update container custom ceph parameters for consumer job
   when:
-    - custom_ceph_parameters|bool
     - job.consumer_job|default(false)|bool
+    - not custom_ceph_parameters|bool
   replace:
     path: "{{ working_dir }}/containers-prepare-parameters.yaml"
     regexp: " {{ item.original }}: (.*)"