Upgrade Grafana deployment to Grafana collection

Change-Id: Id1a49547fecb886263d80a7137dd4dfb1f6c8ea1

grafana/ansible-role-requirements.yml

@@ -1,5 +0,0 @@
----
-- name: grafana
-  scm: git
-  src: https://github.com/cloudalchemy/ansible-grafana
-  version: master

grafana/installGrafana.yml

@@ -28,6 +28,8 @@
       delegate_to: "{{ traefik_staging_node }}"
       become: false
   tasks:
+    - name: Refresh local facts
+      setup:
     - name: Built traefik installation
       block:
         - name: Find traefik binaries
@@ -94,7 +96,7 @@
 
         - name: Install PyMySQL
           package:
-            name: python-pymysql
+            name: python3-pymysql
 
         - name: Create DB for service
           mysql_db:
@@ -157,4 +159,4 @@
             {%   set _ = nodes.append(node) %}
             {% endfor %}
             {{ nodes }}
-    - role: grafana
+    - role: grafana.grafana.grafana

grafana/readme.rst

@@ -40,8 +40,8 @@ Clone the grafana role
 
 .. code-block:: bash
 
-    cd /opt
-    git clone https://github.com/cloudalchemy/ansible-grafana /etc/ansible/roles/grafana
+    cd /opt/openstack-ansible-ops/grafana
+    ansible-galaxy install -r requirements.yml
 
 Copy the env.d file into place
 
@@ -56,8 +56,6 @@ Copy the conf.d file into place
 
     cp conf.d/grafana.yml /etc/openstack_deploy/conf.d/
 
-    Create the containers
-
 Create the containers
 
 .. code-block:: bash

grafana/requirements.yml

@@ -0,0 +1,6 @@
+---
+
+collections:
+- name: grafana.grafana
+  version: 2.2.3
+  type: galaxy