diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2019-04-15 14:48:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-15 14:48:43 +0000 |
| commit | b34d0e540e38d887bb07444e2640ac9234ea7052 (patch) | |
| tree | 33248852245b2ce64697c436789b71eb01b3d742 | |
| parent | 44bb1331811826ab4ac256a8c60b9333e68bd2da (diff) | |
| parent | 0fbf3cc0d715fae76f63bf62c3044e899975660c (diff) | |
Merge "Change default maven path in brmsgw container"
| -rw-r--r-- | kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw-tweaks.sh | 11 | ||||
| -rw-r--r-- | kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw-tweaks.sh b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw-tweaks.sh index 5c3a2a1fe3..d7b27a071c 100644 --- a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw-tweaks.sh +++ b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw-tweaks.sh @@ -39,14 +39,3 @@ for CONFIG in ${PROPS_RUNTIME} ${PROPS_INSTALL}; do sed -i -e "s/brms.dependency.version=.*/brms.dependency.version=${version}/g" "${CONFIG}" fi done - -DEPS_JSON_RUNTIME="${POLICY_HOME}/servers/brmsgw/dependency.json" -DEPS_JSON_INSTALL="${POLICY_HOME}/install/servers/brmsgw/dependency.json" - -for DEP in ${DEPS_JSON_RUNTIME} ${DEPS_JSON_INSTALL}; do - if [ ! -f "${DEP}" ]; then - echo "warning: configuration does not exist: ${DEP}" - else - sed -i -e "s/\"version\":.*-SNAPSHOT\"/\"version\": \"${version}\"/g" "${DEP}" - fi -done diff --git a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf index b074d48501..3952a4cb8d 100644 --- a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf +++ b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf @@ -26,7 +26,7 @@ PDP_HTTP_PASSWORD=alpha123 PDP_PAP_PDP_HTTP_USER_ID=testpap PDP_PAP_PDP_HTTP_PASSWORD=alpha123 -M2_HOME=/usr/share/maven +M2_HOME=/usr/share/java/maven-3 snapshotRepositoryID=policy-nexus-snapshots snapshotRepositoryName=Snapshots snapshotRepositoryURL=http://{{ .Values.global.nexus.nameOverride }}:{{.Values.config.nexusPort}}/nexus/content/repositories/snapshots @@ -64,4 +64,4 @@ BRMS_UEB_API_SECRET= #Dependency.json file version BRMS_DEPENDENCY_VERSION=1.3.1 - +BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT |