Merge "Fix Grafana datasource update"
This commit is contained in:
commit
d6b2f5e69c
@ -29,7 +29,7 @@
|
|||||||
run_once: True
|
run_once: True
|
||||||
changed_when: response.status == 200
|
changed_when: response.status == 200
|
||||||
failed_when: response.status not in [200, 409] or
|
failed_when: response.status not in [200, 409] or
|
||||||
response.status == 409 and ("Data source with same name already exists" not in response.json.message|default(""))
|
response.status == 409 and ("name already exists" not in response.json.message|default(""))
|
||||||
with_dict: "{{ grafana_data_sources }}"
|
with_dict: "{{ grafana_data_sources }}"
|
||||||
when: item.value.enabled | bool
|
when: item.value.enabled | bool
|
||||||
|
|
||||||
|
@ -115,6 +115,6 @@
|
|||||||
changed_when: monasca_grafana_datasource_response.status == 200
|
changed_when: monasca_grafana_datasource_response.status == 200
|
||||||
failed_when: monasca_grafana_datasource_response.status not in [200, 409] or
|
failed_when: monasca_grafana_datasource_response.status not in [200, 409] or
|
||||||
(monasca_grafana_datasource_response.status == 409 and
|
(monasca_grafana_datasource_response.status == 409 and
|
||||||
"Data source with same name already exists" not in monasca_grafana_datasource_response.json.message|default(""))
|
"name already exists" not in monasca_grafana_datasource_response.json.message|default(""))
|
||||||
with_dict: "{{ monasca_grafana_data_sources }}"
|
with_dict: "{{ monasca_grafana_data_sources }}"
|
||||||
when: item.value.enabled | bool
|
when: item.value.enabled | bool
|
||||||
|
5
releasenotes/notes/bug-1881890-72c76f5fc065588b.yaml
Normal file
5
releasenotes/notes/bug-1881890-72c76f5fc065588b.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes Grafana datasource update.
|
||||||
|
`LP#1881890 <https://launchpad.net/bugs/1881890>`__
|
Loading…
Reference in New Issue
Block a user