diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-13 19:36:27 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-13 19:36:27 -0600 |
| commit | ba6f3d3f9bb5b3afe59c90bc434dca0183b082bc (patch) | |
| tree | 46b1b4ca06cf1f21257fd3b0dd43511819c156a4 | |
| parent | 3b7c2765d39a7d5b2cce077e24bb1846a052caa2 (diff) | |
deploy containers to specific nodes
4 files changed, 2 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 9778b98..ccdb6ef 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -14,9 +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" -{% if openbook_admin_api_server_port is defined %} ,"application.port": {{ openbook_admin_api_server_port }} {% endif %} -{% 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 095969c..a1c1632 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -1,7 +1,7 @@ { "log.path": "{{ pillar["admin_web_ui"]["log"] }}" {% raw %} -{% if "True" == openbook_install_admin_web_ui|string() and openbook_admin_web_ui_port is defined %} +{% if "True" == openbook_install_admin_web_ui|string() %} ,"application.port": {{ openbook_admin_web_ui_port }} {% 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 70fc3e7..e471e81 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,6 @@ ,"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" -{% if openbook_customer_api_server_port is defined %} ,"application.port": {{ openbook_customer_api_server_port }} {% 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 1823237..94e7c19 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -1,7 +1,7 @@ { "log.path": "{{ pillar["customer_web_ui"]["log"] }}" {% raw %} -{% if "True" == openbook_install_customer_web_ui|string() and openbook_customer_web_ui_port is defined %} +{% if "True" == openbook_install_customer_web_ui|string() %} ,"application.port": {{ openbook_customer_web_ui_port }} {% endif %} {% endraw %} |