From cfd94f19a2112d3d4ebca934085e68385e2d5828 Mon Sep 17 00:00:00 2001 From: "Donovan Francesco (drifterza)" Date: Wed, 9 Nov 2016 16:36:47 +0200 Subject: [PATCH] Addressing grafana external role's required variables. - https://review.openstack.org/#/c/394562/5/tests/test-install-monasca.yml Change-Id: I816d2c830046c49db20487f85c0dc6acf6c2eebe --- defaults/main.yml | 3 +++ meta/main.yml | 6 ++++++ tests/test-vars.yml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7e1dba4..af00e8a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -118,6 +118,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 diff --git a/meta/main.yml b/meta/main.yml index 4af34a7..b41d307 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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 diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 6dab365..a2d3a57 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -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 }}"