From ce83b0abbfa0efd1b9310ecd789a8c0cf78e405b Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 13 Oct 2017 18:33:23 -0600 Subject: deploy containers to specific nodes --- salt/openbook/admin_api_server/files/admin_api_server.json | 2 +- salt/openbook/admin_web_ui/files/admin_web_ui.json | 2 +- salt/openbook/customer_api_server/files/customer_api_server.json | 2 +- salt/openbook/customer_web_ui/files/customer_web_ui.json | 2 +- salt/openbook/workflow_server/files/workflow_server.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 ccdb6ef..d2abc9c 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -14,7 +14,7 @@ ,"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" - ,"application.port": {{ openbook_admin_api_server_port }} + ,"application.port": {{ openbook_admin_api_server_port|default("") }} {% endif %} {% endraw %} } diff --git a/salt/openbook/admin_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json index a1c1632..93e84db 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -2,7 +2,7 @@ "log.path": "{{ pillar["admin_web_ui"]["log"] }}" {% raw %} {% if "True" == openbook_install_admin_web_ui|string() %} - ,"application.port": {{ openbook_admin_web_ui_port }} + ,"application.port": {{ openbook_admin_web_ui_port|default("") }} {% endif %} {% endraw %} } diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index e471e81..bd8c3f6 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -14,7 +14,7 @@ ,"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" - ,"application.port": {{ openbook_customer_api_server_port }} + ,"application.port": {{ openbook_customer_api_server_port|default("") }} {% endif %} {% endraw %} } diff --git a/salt/openbook/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json index 94e7c19..67f4d26 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -2,7 +2,7 @@ "log.path": "{{ pillar["customer_web_ui"]["log"] }}" {% raw %} {% if "True" == openbook_install_customer_web_ui|string() %} - ,"application.port": {{ openbook_customer_web_ui_port }} + ,"application.port": {{ openbook_customer_web_ui_port|default("") }} {% endif %} {% endraw %} } diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index 604e8bf..1ee399e 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -10,7 +10,7 @@ { "log.path": "{{ pillar["workflow_server"]["log"] }}" {% raw %} -{% if "True" == openbook_install_workflow_serverr|string() %} +{% if "True" == openbook_install_workflow_server|string() %} ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" {% endif %} -- cgit v1.3