diff options
4 files changed, 9 insertions, 6 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 d2abc9c..9778b98 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,9 @@ ,"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|default("") }} +{% 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 93e84db..095969c 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -1,8 +1,8 @@ { "log.path": "{{ pillar["admin_web_ui"]["log"] }}" {% raw %} -{% if "True" == openbook_install_admin_web_ui|string() %} - ,"application.port": {{ openbook_admin_web_ui_port|default("") }} +{% if "True" == openbook_install_admin_web_ui|string() and openbook_admin_web_ui_port is defined %} + ,"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 bd8c3f6..70fc3e7 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,8 @@ ,"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|default("") }} +{% 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 67f4d26..1823237 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -1,8 +1,8 @@ { "log.path": "{{ pillar["customer_web_ui"]["log"] }}" {% raw %} -{% if "True" == openbook_install_customer_web_ui|string() %} - ,"application.port": {{ openbook_customer_web_ui_port|default("") }} +{% if "True" == openbook_install_customer_web_ui|string() and openbook_customer_web_ui_port is defined %} + ,"application.port": {{ openbook_customer_web_ui_port }} {% endif %} {% endraw %} } |