diff options
| author |   Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-10-25 15:34:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-25 15:34:59 +0000 |
| commit | 21523fd8fcf5e266ace45988890ab9a8b3fab930 (patch) | |
| tree | 85414692d033617314598b1335abdb0e0cea75cb /policy-management/src/main/server/config/engine.properties | |
| parent | 62d67b8e2342e678c8f559939bb722ad6ddbd64f (diff) | |
| parent | 327ac05ea0e29a8d604f187d78f1a48aa35d8b4a (diff) | |
Merge "Allow encrypted property values"
Diffstat (limited to 'policy-management/src/main/server/config/engine.properties')
| -rw-r--r-- | policy-management/src/main/server/config/engine.properties | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties index aa9b6d80..4f114d88 100644 --- a/policy-management/src/main/server/config/engine.properties +++ b/policy-management/src/main/server/config/engine.properties @@ -22,27 +22,28 @@ dmaap.source.topics=PDPD-CONFIGURATION -dmaap.source.topics.PDPD-CONFIGURATION.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${env:PDPD_CONFIGURATION_TOPIC} -dmaap.source.topics.PDPD-CONFIGURATION.apiKey=${env:PDPD_CONFIGURATION_API_KEY} -dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${env:PDPD_CONFIGURATION_API_SECRET} -dmaap.source.topics.PDPD-CONFIGURATION.consumerGroup=${env:PDPD_CONFIGURATION_CONSUMER_GROUP} -dmaap.source.topics.PDPD-CONFIGURATION.consumerInstance=${env:PDPD_CONFIGURATION_CONSUMER_INSTANCE} +dmaap.source.topics.PDPD-CONFIGURATION.servers=${envd:DMAAP_SERVERS} +dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${envd:PDPD_CONFIGURATION_TOPIC} +dmaap.source.topics.PDPD-CONFIGURATION.apiKey=${envd:PDPD_CONFIGURATION_API_KEY} +dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${envd:PDPD_CONFIGURATION_API_SECRET} +dmaap.source.topics.PDPD-CONFIGURATION.consumerGroup=${envd:PDPD_CONFIGURATION_CONSUMER_GROUP} +dmaap.source.topics.PDPD-CONFIGURATION.consumerInstance=${envd:PDPD_CONFIGURATION_CONSUMER_INSTANCE} dmaap.source.topics.PDPD-CONFIGURATION.managed=false dmaap.source.topics.PDPD-CONFIGURATION.https=true http.server.services=SECURED-CONFIG -http.server.services.SECURED-CONFIG.host=${env:TELEMETRY_HOST} +http.server.services.SECURED-CONFIG.host=${envd:TELEMETRY_HOST} http.server.services.SECURED-CONFIG.port=9696 -http.server.services.SECURED-CONFIG.userName=${env:TELEMETRY_USER} -http.server.services.SECURED-CONFIG.password=${env:TELEMETRY_PASSWORD} +http.server.services.SECURED-CONFIG.userName=${envd:TELEMETRY_USER} +http.server.services.SECURED-CONFIG.password=${envd:TELEMETRY_PASSWORD} http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful http.server.services.SECURED-CONFIG.managed=false http.server.services.SECURED-CONFIG.swagger=true http.server.services.SECURED-CONFIG.https=true -http.server.services.SECURED-CONFIG.aaf=${env:AAF} +http.server.services.SECURED-CONFIG.aaf=${envd:AAF:false} http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler -aaf.namespace=${env:AAF_NAMESPACE} -aaf.root.permission=${env:AAF_NAMESPACE}.pdpd +aaf.namespace=${envd:AAF_NAMESPACE:false} +aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd + |