openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Fixing condition for ceph custom parameters updates"

Browse Source
This commit is contained in:
Zuul
2022-07-25 05:00:57 +00:00
committed by Gerrit Code Review
parent abc50905fa df634354a6
commit c661d74da7
2 changed files with 2 additions and 3 deletions
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 }}: (.*)"