diff options
2 files changed, 9 insertions, 9 deletions
diff --git a/controlloop/packages/basex/src/files/config/controlloop.properties.environment b/controlloop/packages/basex/src/files/config/controlloop.properties.environment index bc4989b85..86fe1ed28 100644 --- a/controlloop/packages/basex/src/files/config/controlloop.properties.environment +++ b/controlloop/packages/basex/src/files/config/controlloop.properties.environment @@ -22,6 +22,7 @@ # directory, it will be automatically loaded by PDP-D, after being expanded # by installation scripts. +sql.db.host=${{SQL_HOST}} sql.db.username=${{SQL_USER}} sql.db.password=${{SQL_PASSWORD}} @@ -38,11 +39,11 @@ vfc.username=${{VFC_USERNAME}} vfc.password=${{VFC_PASSWORD}} pdpx.host=${{PDP_HOST}} -pdpx.username={{PDP_USERNAME}} -pdpx.password={{PDP_PASSWORD}} -pdpx.environment={{PDP_ENVIRONMENT}} -pdpx.client.username={{PDP_CLIENT_USERNAME}} -pdpx.client.password={{PDP_CLIENT_PASSWORD}} +pdpx.username=${{PDP_USERNAME}} +pdpx.password=${{PDP_PASSWORD}} +pdpx.environment=${{PDP_ENVIRONMENT}} +pdpx.client.username=${{PDP_CLIENT_USERNAME}} +pdpx.client.password=${{PDP_CLIENT_PASSWORD}} guard.url=http://${{PDP_HOST}}:8081/pdp/api/getDecision guard.jdbc.url=mariadb://${{SQL_HOST}}:3306/operationshistory10 diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl index b56d22033..3273dc6c9 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl @@ -114,7 +114,6 @@ rule "${policyName}.SETUP" logger.info("{}: {} : YAML=[{}]", params.getClosedLoopControlName(), drools.getRule().getName(), params.getControlLoopYaml()); String sqlDbUsername = PolicyEngine.manager.getEnvironmentProperty("sql.db.username"); - String sqlDbPassword = PolicyEngine.manager.getEnvironmentProperty("sql.db.password"); String aaiUrl = PolicyEngine.manager.getEnvironmentProperty("aai.url"); String aaiUsername = PolicyEngine.manager.getEnvironmentProperty("aai.username"); @@ -129,8 +128,8 @@ rule "${policyName}.SETUP" String vfcPassword = PolicyEngine.manager.getEnvironmentProperty("vfc.password"); String guardUrl = PolicyEngine.manager.getEnvironmentProperty("guard.url"); - String guardUsername = PolicyEngine.manager.getEnvironmentProperty("guard.username"); - String guardPassword = PolicyEngine.manager.getEnvironmentProperty("guard.password"); + String guardUsername = PolicyEngine.manager.getEnvironmentProperty("pdpx.username"); + String guardPassword = PolicyEngine.manager.getEnvironmentProperty("pdpx.password"); String guardJdbcUrl = PolicyEngine.manager.getEnvironmentProperty("guard.jdbc.url"); String guardDisabled = PolicyEngine.manager.getEnvironmentProperty("guard.disabled"); @@ -138,7 +137,7 @@ rule "${policyName}.SETUP" logger.info("{}: {} : SO=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), soUrl, soUsername); logger.info("{}: {} : VFC=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), vfcUrl, vfcUsername); logger.info("{}: {} : GUARD=[{}:{}:{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), guardUrl, guardUsername, guardJdbcUrl, guardDisabled); - logger.info("{}: {} : DB=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), sqlDbUsername, sqlDbPassword); + logger.info("{}: {} : DB=[{}]", params.getClosedLoopControlName(), drools.getRule().getName(), sqlDbUsername); end /* |