diff options
| author |   jhh <jorge.hernandez-herrero@att.com> | 2019-04-18 16:40:58 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-04-26 04:48:55 +0000 |
| commit | 6aeba035926698a71eea3bf7275c00f5975e1b7e (patch) | |
| tree | 3bf5350dd75ac93cd692ec1465044d5dfbab412d | |
| parent | 8c0eac4373f6453b8b04f7b4884510b489527590 (diff) | |
Use policy-pdpd-cl image for drools
Change-Id: I233d2da28fea73bd594ee25cba8cd5740aa9236a
Issue-ID: POLICY-1664
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
| -rw-r--r-- | config/drools/base.conf | 2 | ||||
| -rw-r--r-- | config/pe/base.conf | 4 | ||||
| -rw-r--r-- | config/pe/brmsgw.conf | 5 | ||||
| -rw-r--r-- | docker-compose.yml | 8 |
4 files changed, 10 insertions, 9 deletions
diff --git a/config/drools/base.conf b/config/drools/base.conf index 070019b5..59a88e99 100644 --- a/config/drools/base.conf +++ b/config/drools/base.conf @@ -26,7 +26,7 @@ JVM_OPTIONS=-server -Xms512m -Xmx1024m POLICY_HOME=/opt/app/policy POLICY_LOGS=/var/log/onap/policy/pdpd -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk +JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 KEYSTORE_PASSWD=Pol1cy_0nap TRUSTSTORE_PASSWD=Pol1cy_0nap diff --git a/config/pe/base.conf b/config/pe/base.conf index df1d2885..5aeaf266 100644 --- a/config/pe/base.conf +++ b/config/pe/base.conf @@ -1,4 +1,4 @@ -# Copyright 2018 AT&T Intellectual Property. All rights reserved +# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk +JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 POLICY_HOME=/opt/app/policy POLICY_LOGS=/var/log/onap KEYSTORE_PASSWD=Pol1cy_0nap diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf index dc92c445..5d013b8f 100644 --- a/config/pe/brmsgw.conf +++ b/config/pe/brmsgw.conf @@ -25,7 +25,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://nexus:8081/nexus/content/repositories/snapshots @@ -62,5 +62,6 @@ BRMS_UEB_API_KEY= BRMS_UEB_API_SECRET= #Dependency.json file version -BRMS_DEPENDENCY_VERSION=1.2.3-SNAPSHOT +BRMS_DEPENDENCY_VERSION=1.4.0-SNAPSHOT +BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT diff --git a/docker-compose.yml b/docker-compose.yml index c469755a..16822202 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: ports: - "9081:8081" pap: - image: onap/policy-pe + image: onap/policy-pe:1.4-SNAPSHOT-latest environment: - PRELOAD_POLICIES=${PRELOAD_POLICIES} container_name: pap @@ -50,7 +50,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config pdp: - image: onap/policy-pe + image: onap/policy-pe:1.4-SNAPSHOT-latest container_name: pdp depends_on: - pap @@ -61,7 +61,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config brmsgw: - image: onap/policy-pe + image: onap/policy-pe:1.4-SNAPSHOT-latest container_name: brmsgw depends_on: - pap @@ -70,7 +70,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config drools: - image: onap/policy-drools + image: onap/policy-pdp-cl:1.4-SNAPSHOT-latest container_name: drools depends_on: - mariadb |