Merge "Fix Grafana datasource update"

ansible/roles/grafana/tasks/post_config.yml

@@ -29,7 +29,7 @@
   run_once: True
   changed_when: response.status == 200
   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 }}"
   when: item.value.enabled | bool
 

ansible/roles/monasca/tasks/post_config.yml

@@ -115,6 +115,6 @@
   changed_when: monasca_grafana_datasource_response.status == 200
   failed_when: monasca_grafana_datasource_response.status not in [200, 409] or
                (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 }}"
   when: item.value.enabled | bool

releasenotes/notes/bug-1881890-72c76f5fc065588b.yaml

+---
+fixes:
+  - |
+    Fixes Grafana datasource update.
+    `LP#1881890 <https://launchpad.net/bugs/1881890>`__