diff options
author | a.sreekumar <ajith.sreekumar@est.tech> | 2020-02-14 12:03:33 +0000 |
---|---|---|
committer | a.sreekumar <ajith.sreekumar@est.tech> | 2020-03-03 16:08:24 +0000 |
commit | 2070574bb059eb665a3f00e7cba3c1a5380c5334 (patch) | |
tree | df4ef4c92ef82fdaf527555fcc6f447e3ebf838f /scripts/policy/config/drools | |
parent | 7230b715f5a943b883afd2b9f5fb59ebc50aa387 (diff) |
CSIT fixes for frankfurt breakage
CSITs as per the latest policy type validation changes.
Drools and drools apps fixes.
Removed policy-health.
Change-Id: I086bf747059435e12d15e0481b00c97c20eaadc1
Issue-ID: POLICY-1402
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'scripts/policy/config/drools')
-rwxr-xr-x[-rw-r--r--] | scripts/policy/config/drools/custom/noop.pre.sh (renamed from scripts/policy/config/drools/feature-healthcheck.conf) | 10 | ||||
-rw-r--r-- | scripts/policy/config/drools/env/base.conf (renamed from scripts/policy/config/drools/base.conf) | 40 |
2 files changed, 28 insertions, 22 deletions
diff --git a/scripts/policy/config/drools/feature-healthcheck.conf b/scripts/policy/config/drools/custom/noop.pre.sh index c205e9f7..63bdc4cf 100644..100755 --- a/scripts/policy/config/drools/feature-healthcheck.conf +++ b/scripts/policy/config/drools/custom/noop.pre.sh @@ -1,5 +1,6 @@ +#!/bin/bash -x # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020 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. @@ -14,5 +15,8 @@ # limitations under the License. # ============LICENSE_END========================================================= -HEALTHCHECK_USER=demo@people.osaaf.org -HEALTHCHECK_PASSWORD=demo123456! +sed -i "s/^dmaap/noop/g" \ + ${POLICY_HOME}/config/engine.properties \ + ${POLICY_HOME}/config/feature-lifecycle.properties + +chmod 644 ${POLICY_HOME}/config/engine.properties ${POLICY_HOME}/config/feature-lifecycle.properties diff --git a/scripts/policy/config/drools/base.conf b/scripts/policy/config/drools/env/base.conf index 1e57226a..8fef8a28 100644 --- a/scripts/policy/config/drools/base.conf +++ b/scripts/policy/config/drools/env/base.conf @@ -20,6 +20,7 @@ JVM_OPTIONS=-server -Xms512m -Xmx512m # SYSTEM software configuration +DEBUG=y POLICY_HOME=/opt/app/policy POLICY_LOGS=/var/log/onap/policy/pdpd KEYSTORE_PASSWD=Pol1cy_0nap @@ -34,18 +35,19 @@ TELEMETRY_PASSWORD=demo123456! # nexus repository -SNAPSHOT_REPOSITORY_ID= -SNAPSHOT_REPOSITORY_URL= -RELEASE_REPOSITORY_ID= -RELEASE_REPOSITORY_URL= -REPOSITORY_USERNAME= -REPOSITORY_PASSWORD= +SNAPSHOT_REPOSITORY_ID=policy-nexus-snapshots +SNAPSHOT_REPOSITORY_URL=http://nexus:8081/nexus/content/repositories/snapshots/ +RELEASE_REPOSITORY_ID=policy-nexus-releases +RELEASE_REPOSITORY_URL=http://nexus:8081/nexus/content/repositories/releases/ +REPOSITORY_USERNAME=admin +REPOSITORY_PASSWORD=admin123 +REPOSITORY_OFFLINE=false # Relational (SQL) DB access -SQL_HOST= -SQL_USER= -SQL_PASSWORD= +SQL_HOST=mariadb +SQL_USER=policy_user +SQL_PASSWORD=policy_user # AAF @@ -70,23 +72,23 @@ POLICY_PDP_PAP_API_SECRET= # PAP -PAP_HOST=pap -PAP_USERNAME=testpap -PAP_PASSWORD=alpha123 +PAP_HOST= +PAP_USERNAME= +PAP_PASSWORD= # PDP-X -PDP_HOST=pdp -PDP_USERNAME=testpdp -PDP_PASSWORD=alpha123 -PDP_CLIENT_USERNAME=python -PDP_CLIENT_PASSWORD=test -PDP_ENVIRONMENT=TEST +PDP_HOST= +PDP_USERNAME= +PDP_PASSWORD= +PDP_CLIENT_USERNAME= +PDP_CLIENT_PASSWORD= +PDP_ENVIRONMENT= # DCAE DMaaP DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT -DCAE_SERVERS=mr.api.simpledemo.onap.org +DCAE_SERVERS= DCAE_CONSUMER_GROUP=dcae.policy.shared # Open DMaaP |