openstack
/
openstack-ansible-os_monasca
Code Issues Proposed changes

Merge "Addressing grafana external role's required variables."

This commit is contained in:
Jenkins 2016-11-10 02:24:07 +00:00 committed by Gerrit Code Review
parent 8ea0b5118d cfd94f19a2
commit 25fa6661ae
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -100,6 +100,9 @@ monasca_keystone_auth_plugin: password
monasca_service_project_domain_name: Default
monasca_service_user_domain_name: default
# Galera defaults
monasca_galera_address: 127.0.0.1
# Grafana Galera
monasca_grafana_galera_database: grafana
monasca_grafana_galera_username: grafana

6
meta/main.yml
View File

@ -51,6 +51,12 @@ dependencies:
- role: ansible-influxdb
tags: skip_ansible_lint
- role: ansible-grafana
grafana_mysql_host: "{{ monasca_galera_address }}"
grafana_admin_password: "{{ monasca_grafana_admin_password }}"
grafana_mysql_db: "{{ monasca_grafana_galera_database }}"
grafana_mysql_user: "{{ monasca_grafana_galera_username }}"
grafana_mysql_password: "{{ monasca_grafana_galera_password }}"
grafana_keystone_url: "{{ keystone_service_internalurl }}"
tags: skip_ansible_lint
- role: ansible-monasca-schema
tags: skip_ansible_lint

2
tests/test-vars.yml
View File

@ -67,4 +67,4 @@ grafana_admin_password: "{{ monasca_grafana_admin_password }}"
grafana_mysql_db: "{{ monasca_grafana_galera_database }}"
grafana_mysql_user: "{{ monasca_grafana_galera_username }}"
grafana_mysql_password: "{{ monasca_grafana_galera_password }}"
grafana_keystone_url: "{{ keystone_service_internaluri }}"
grafana_keystone_url: "{{ keystone_service_internalurl }}"