From 8bc3490a4c72faf7d4385e93eefa887c9b1dabc2 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 23 Feb 2018 15:13:20 -0700 Subject: Add db.user and db.password to Openbook JSON Issue: IS-64 --- salt/openbook/admin_api_server/files/admin_api_server.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'salt/openbook/admin_api_server/files') diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json index cf47825..4cdb682 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -10,7 +10,9 @@ { "log.path": "{{ pillar["admin_api_server"]["log"] }}" {% raw %} -{% if "True" == openbook_install_admin_api_server|string() %} + {% if "True" == openbook_install_admin_api_server|string() %} + ,"db.user": "{{ openbook_database_user }}" + ,"db.password": "{{ openbook_database_password }}" ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" -- cgit v1.3