openstack/kayobe
Code Issues Proposed changes

Use the grafana-conf role to clone the DB repo

Browse Source
This commit is contained in:
Doug Szumski 2018-01-22 16:55:00 +00:00
parent 3a757b597d
commit 4ac756bf65
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/overcloud-grafana-configure.yml
View File

@ -25,13 +25,6 @@
kolla_internal_vip_address: "{{ internal_net_name | net_ip(network_host) }}"
when: not kolla_enable_haproxy | bool
- name: Clone dashboards
git:
repo: "{{ grafana_monitoring_node_dashboard_repo }}"
dest: "{{ grafana_monitoring_node_dashboard_repo_path }}"
when: grafana_monitoring_node_dashboard_repo | bool
become: True
- name: Include Kolla passwords for Grafana local admin account credentials
include_vars: "{{ kayobe_config_path }}/kolla/passwords.yml"
roles:
@ -39,6 +32,9 @@
grafana_conf_organisation: "{{ grafana_control_plane_organisation }}"
grafana_conf_grafana_admin_user: "{{ grafana_local_admin_user_name }}"
grafana_conf_grafana_admin_pass: "{{ grafana_admin_password }}"
grafana_conf_grafana_dashboard_repo:
path: "{{ grafana_monitoring_node_dashboard_repo }}"
checkout_path: "{{ grafana_monitoring_node_dashboard_repo_path }}"
relative_path: "{{ grafana_monitoring_node_dashboard_path }}"
grafana_conf_grafana_url: "http://{{ kolla_internal_vip_address }}:3000"
grafana_conf_grafana_datasources: "{{ grafana_datasources }}"
grafana_conf_grafana_dashboards: "{{ grafana_monitoring_node_dashboard_repo_path }}{{ grafana_monitoring_node_dashboard_path }}"