openstack
/
kolla-ansible
Code Issues Proposed changes

Fix Prometheus Server/Alertmanager config update 

The Alertmanger config task conflicts with the Prometheus Server task
by overwriting the variable used to determine whether the server
config was updated. This has been fixed in master, but the commit
in master combines the fix with a new feature. See #1776529.

Change-Id: I38409d8a4b94b29ef5d7a4434c53bf0d7da8e443
Closes-Bug: #1820241
This commit is contained in:
Doug Szumski 2019-03-15 10:03:47 +00:00
parent 03a1a61e47
commit 47883649e0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/prometheus/handlers/main.yml
View File

@ -145,4 +145,5 @@
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
or prometheus_alertmanager_confs.changed | bool
or prometheus_container.changed | bool

2
ansible/roles/prometheus/tasks/config.yml
View File

@ -47,7 +47,7 @@
template:
src: "{{ item }}"
dest: "{{ node_config_directory }}/prometheus-alertmanager/prometheus-alertmanager.yml"
register: prometheus_confs
register: prometheus_alertmanager_confs
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool