From b9e27b5ddde21cf4feb378f975137f4d5ea87854 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 24 Mar 2020 10:41:21 -0400 Subject: Configure http client URIs via env properties The context URI path for the various actors needs to be configurable via properties specified in the OOM charts. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn Change-Id: I7348d0c4f47a33dbc806ad117f35b96c887b5394 --- .../src/main/feature/config/AAI-http-client.properties | 10 +++++----- .../src/main/feature/config/GUARD-http-client.properties | 10 +++++----- .../src/main/feature/config/SDNC-http-client.properties | 10 +++++----- .../src/main/feature/config/SO-http-client.properties | 10 +++++----- .../src/main/feature/config/VFC-http-client.properties | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'controlloop/common/feature-controlloop-management/src/main') diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties index 5a5f82f4d..2eb76007c 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties @@ -20,8 +20,8 @@ http.client.services=AAI http.client.services.AAI.managed=true http.client.services.AAI.https=true -http.client.services.AAI.host=${env:AAI_HOST} -http.client.services.AAI.port=${env:AAI_PORT} -http.client.services.AAI.username=${env:AAI_USERNAME} -http.client.services.AAI.password=${env:AAI_PASSWORD} -http.client.services.AAI.contextUriPath= +http.client.services.AAI.host=${envd:AAI_HOST} +http.client.services.AAI.port=${envd:AAI_PORT} +http.client.services.AAI.username=${envd:AAI_USERNAME} +http.client.services.AAI.password=${envd:AAI_PASSWORD} +http.client.services.AAI.contextUriPath=${envd:AAI_CONTEXT_URI} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties index e1d00bd6a..98122f5ee 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties @@ -20,8 +20,8 @@ http.client.services=GUARD http.client.services.GUARD.managed=true http.client.services.GUARD.https=true -http.client.services.GUARD.host=${env:PDP_HOST} -http.client.services.GUARD.port=${env:PDP_PORT} -http.client.services.GUARD.username=${env:PDP_USERNAME} -http.client.services.GUARD.password=${env:PDP_PASSWORD} -http.client.services.GUARD.contextUriPath=policy/pdpx/v1 +http.client.services.GUARD.host=${envd:PDP_HOST} +http.client.services.GUARD.port=${envd:PDP_PORT} +http.client.services.GUARD.username=${envd:PDP_USERNAME} +http.client.services.GUARD.password=${envd:PDP_PASSWORD} +http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties index ad11c3fa5..255a32103 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties @@ -20,8 +20,8 @@ http.client.services=SDNC http.client.services.SDNC.managed=true http.client.services.SDNC.https=true -http.client.services.SDNC.host=${env:SDNC_HOST} -http.client.services.SDNC.port=${env:SDNC_PORT} -http.client.services.SDNC.username=${env:SDNC_USERNAME} -http.client.services.SDNC.password=${env:SDNC_PASSWORD} -http.client.services.SDNC.contextUriPath= +http.client.services.SDNC.host=${envd:SDNC_HOST} +http.client.services.SDNC.port=${envd:SDNC_PORT} +http.client.services.SDNC.username=${envd:SDNC_USERNAME} +http.client.services.SDNC.password=${envd:SDNC_PASSWORD} +http.client.services.SDNC.contextUriPath=${envd:SDNC_CONTEXT_URI} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties index 45e77ad15..65e1b4ff6 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties @@ -20,8 +20,8 @@ http.client.services=SO http.client.services.SO.managed=true http.client.services.SO.https=true -http.client.services.SO.host=${env:SO_HOST} -http.client.services.SO.port=${env:SO_PORT} -http.client.services.SO.username=${env:SO_USERNAME} -http.client.services.SO.password=${env:SO_PASSWORD} -http.client.services.SO.contextUriPath= +http.client.services.SO.host=${envd:SO_HOST} +http.client.services.SO.port=${envd:SO_PORT} +http.client.services.SO.username=${envd:SO_USERNAME} +http.client.services.SO.password=${envd:SO_PASSWORD} +http.client.services.SO.contextUriPath=${envd:SO_CONTEXT_URI} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties index 28a2a75b1..f09880763 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties @@ -20,8 +20,8 @@ http.client.services=VFC http.client.services.VFC.managed=true http.client.services.VFC.https=true -http.client.services.VFC.host=${env:VFC_HOST} -http.client.services.VFC.port=${env:VFC_PORT} -http.client.services.VFC.username=${env:VFC_USERNAME} -http.client.services.VFC.password=${env:VFC_PASSWORD} -http.client.services.VFC.contextUriPath=api/nslcm/v1 +http.client.services.VFC.host=${envd:VFC_HOST} +http.client.services.VFC.port=${envd:VFC_PORT} +http.client.services.VFC.username=${envd:VFC_USERNAME} +http.client.services.VFC.password=${envd:VFC_PASSWORD} +http.client.services.VFC.contextUriPath=${envd:VFC_CONTEXT_URI:api/nslcm/v1} -- cgit 1.2.3-korg