Merge pull request #8114 from mrsiano/bz_1570922

Fix BZ 1570922.

roles/openshift_grafana/tasks/install_grafana.yaml

@@ -169,7 +169,7 @@
   uri:
     url: "{{ grafana_route }}/api/datasources"
     user: "{{ grafana_sa_token.stdout }}"
-    force_basic_auth: true
+    validate_certs: false
     method: POST
     body: '{{ payload_data }}'
     body_format: json
@@ -215,7 +215,7 @@
   uri:
     url: "{{ grafana_route }}/api/dashboards/db"
     user: "{{ grafana_sa_token.stdout }}"
-    force_basic_auth: true
+    validate_certs: false
     method: POST
     body: '{{ slurpfile["content"] | b64decode }}'
     body_format: json
@@ -232,7 +232,7 @@
   uri:
     url: "{{ grafana_route }}/api/dashboards/db"
     user: "{{ grafana_sa_token.stdout }}"
-    force_basic_auth: true
+    validate_certs: false
     method: POST
     body: '{{ slurpfile["content"] | b64decode }}'
     body_format: json

roles/openshift_grafana/tasks/uninstall_grafana.yaml

@@ -4,4 +4,4 @@
 - name: Remove grafana project
   oc_project:
     state: absent
-    name: "{{ grafana_namespace }}"
+    name: "{{ openshift_grafana_namespace }}"