diff --git a/grafana/ansible-role-requirements.yml b/grafana/ansible-role-requirements.yml deleted file mode 100644 index 6bc583d6..00000000 --- a/grafana/ansible-role-requirements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: grafana - scm: git - src: https://github.com/cloudalchemy/ansible-grafana - version: master diff --git a/grafana/installGrafana.yml b/grafana/installGrafana.yml index 88c5a61d..061cc898 100644 --- a/grafana/installGrafana.yml +++ b/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 diff --git a/grafana/readme.rst b/grafana/readme.rst index b5fe1954..c932553c 100644 --- a/grafana/readme.rst +++ b/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 diff --git a/grafana/requirements.yml b/grafana/requirements.yml new file mode 100644 index 00000000..8f04eefd --- /dev/null +++ b/grafana/requirements.yml @@ -0,0 +1,6 @@ +--- + +collections: +- name: grafana.grafana + version: 2.2.3 + type: galaxy