openstack/openstack-ansible-ops
Code Issues Proposed changes

Updates to Grafana role

Browse Source 
The inclusion of the grafana submodule contradicts the deployment
process in the README, where it is explicitly cloned to
/etc/ansible/roles. The empty folder for the submodule takes
higher precendence than explicit clone, meaning that the grafana
role is found, but contains no tasks. The submodule has been
deleted to stop this.

There are also failures when running behind a proxy in the
traefik-common role, These are now avoided by running the role
with deployment_environment_variables set.

Change-Id: Icc34087e17906c763286b98591bade73fa7c022e
This commit is contained in:
Duncan Martin Walker 2020-01-07 10:34:25 +00:00
parent dd5fc5f788
commit 1006dab986
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grafana/installGrafana.yml
View File

@ -138,6 +138,7 @@
roles: roles:
- role: traefik_common - role: traefik_common
environment: "{{ deployment_environment_variables | default({}) }}"
traffic_dashboard_bind: "{{ hostvars[inventory_hostname]['ansible_' ~ (ansible_default_ipv4['interface'] | replace('-', '_') | string)]['ipv4']['address'] }}" traffic_dashboard_bind: "{{ hostvars[inventory_hostname]['ansible_' ~ (ansible_default_ipv4['interface'] | replace('-', '_') | string)]['ipv4']['address'] }}"
traefik_dashboard_enabled: true traefik_dashboard_enabled: true
traefik_destinations: traefik_destinations:

1
grafana/roles/grafana

@ -1 +0,0 @@
Subproject commit 4f23cfe48054792f0c84255b64dbe09a82744e20