From 248a5b7140310c797f750556f9020c44a0fb2828 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 24 Mar 2020 15:08:31 -0400 Subject: Replace url with host/port in drools-apps Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn Change-Id: Id81638d76d0bf71d49d8663ee569b43bfbe6b1aa --- .../config/controlloop.properties.environment | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'controlloop') diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index f76e5f45c..18e7c936f 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -23,36 +23,36 @@ # directory, it will be automatically loaded by PDP-D, after being expanded # by installation scripts. -sql.db.host=${env:SQL_HOST} -sql.db.username=${env:SQL_USER} -sql.db.password=${env:SQL_PASSWORD} +sql.db.host=${envd:SQL_HOST} +sql.db.username=${envd:SQL_USER} +sql.db.password=${envd:SQL_PASSWORD} -aai.url=${env:AAI_URL} -aai.username=${env:AAI_USERNAME} -aai.password=${env:AAI_PASSWORD} +aai.url=https://${envd:AAI_HOST}:${envd:AAI_PORT:443}/${envd:AAI_CONTEXT_URI} +aai.username=${envd:AAI_USERNAME} +aai.password=${envd:AAI_PASSWORD} -so.url=${env:SO_URL} -so.username=${env:SO_USERNAME} -so.password=${env:SO_PASSWORD} +so.url=https://${envd:SO_HOST}:${envd:SO_PORT:443}/${envd:SO_CONTEXT_URI} +so.username=${envd:SO_USERNAME} +so.password=${envd:SO_PASSWORD} -vfc.url=${env:VFC_URL} -vfc.username=${env:VFC_USERNAME} -vfc.password=${env:VFC_PASSWORD} +vfc.url=https://${envd:VFC_HOST}:${envd:VFC_PORT:443}/${envd:VFC_CONTEXT_URI} +vfc.username=${envd:VFC_USERNAME} +vfc.password=${envd:VFC_PASSWORD} -pdpx.host=${env:PDP_HOST} -pdpx.username=${env:PDP_USERNAME} -pdpx.password=${env:PDP_PASSWORD} +pdpx.host=${envd:PDP_HOST} +pdpx.username=${envd:PDP_USERNAME} +pdpx.password=${envd:PDP_PASSWORD} -guard.url=https://${env:PDP_HOST}:6969/policy/pdpx/v1/decision -guard.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/operationshistory +guard.url=https://${envd:PDP_HOST}:${envd:PDP_PORT:443}/${envd:PDP_CONTEXT_URI}/decision +guard.jdbc.url=jdbc:mariadb://${envd:SQL_HOST}:3306/operationshistory guard.disabled=false -sdnc.url=${env:SDNC_URL} -sdnc.username=${env:SDNC_USERNAME} -sdnc.password=${env:SDNC_PASSWORD} +sdnc.url=https://${envd:SDNC_HOST}:${envd:SDNC_PORT:443}/${envd:SDNC_CONTEXT_URI} +sdnc.username=${envd:SDNC_USERNAME} +sdnc.password=${envd:SDNC_PASSWORD} -cds.grpcHost=${env:CDS_GRPC_HOST} -cds.grpcPort=${env:CDS_GRPC_PORT} -cds.grpcUsername=${env:CDS_GRPC_USERNAME} -cds.grpcPassword=${env:CDS_GRPC_PASSWORD} +cds.grpcHost=${envd:CDS_GRPC_HOST} +cds.grpcPort=${envd:CDS_GRPC_PORT} +cds.grpcUsername=${envd:CDS_GRPC_USERNAME} +cds.grpcPassword=${envd:CDS_GRPC_PASSWORD} cds.grpcTimeout=10 -- cgit 1.2.3-korg