openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

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
This commit is contained in:
Douglas Viroel 2022-07-19 09:30:02 -03:00
parent ff64ea937c
commit df634354a6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/standalone/defaults/main.yml
View File

@ -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

3
roles/standalone/tasks/containers.yml
View File

@ -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 }}: (.*)"