From 7b8d628c90433436a8e0590e823083b8ab9ff7b9 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 13 Oct 2017 11:07:28 -0600 Subject: JSON fix for jobs and workflow servers --- salt/openbook/job_scheduler_server/files/job_scheduler_server.json | 1 - salt/openbook/workflow_server/files/workflow_server.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'salt/openbook') diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json index 673a8c2..cd64da9 100644 --- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json +++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json @@ -10,6 +10,5 @@ { "log.path": "{{ pillar["job_scheduler_server"]["log"] }}", "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook", - "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow", "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs" } diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index 0ff5f64..b266fe7 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -10,6 +10,5 @@ { "log.path": "{{ pillar["workflow_server"]["log"] }}", "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook", - "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow", - "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs" + "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow" } -- cgit v1.3