aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-09-19 14:35:22 -0500
committerJorge Hernandez <jh1730@att.com>2018-09-19 15:42:09 -0500
commit88d1b6ccc92a42c94c2cd462789a90fcf245efb2 (patch)
tree160cc62dbd4798c0de2037f494d352bf7a9d1b7f /packages
parentbc7885882394ec60a1fb255a16b63c00a91c7172 (diff)
AAF Configuration in PDP-D
AAF is disabled by default until pairwise testing is completed. Change-Id: Ica83873a2605742689ed0c2e06dfade20bef8bf0 Signed-off-by: Jorge Hernandez <jh1730@att.com> Issue-ID: POLICY-1043 Signed-off-by: Jorge Hernandez <jh1730@att.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/docker/src/main/docker/do-start.sh20
-rw-r--r--packages/install/src/files/base.conf5
2 files changed, 24 insertions, 1 deletions
diff --git a/packages/docker/src/main/docker/do-start.sh b/packages/docker/src/main/docker/do-start.sh
index 9e4659df..af7b3d9c 100644
--- a/packages/docker/src/main/docker/do-start.sh
+++ b/packages/docker/src/main/docker/do-start.sh
@@ -56,7 +56,7 @@ else
. /opt/app/policy/etc/profile.d/env.sh
- # override the policy keystore and truststore if present
+ # allow user to override the key or/and the trust stores
if [[ -f config/policy-keystore ]]; then
cp -f config/policy-keystore ${POLICY_HOME}/etc/ssl
@@ -66,6 +66,24 @@ else
cp -f config/policy-truststore ${POLICY_HOME}/etc/ssl
fi
+ # allow user to override all or some aaf configuration
+
+ if [[ -f config/aaf.properties ]]; then
+ cp -f config/aaf.properties ${POLICY_HOME}/config/aaf.properties
+ fi
+
+ if [[ -f config/aaf-location.properties ]]; then
+ cp -f config/aaf-location.properties ${POLICY_HOME}/config/aaf-location.properties
+ fi
+
+ if [[ -f config/aaf-credentials.properties ]]; then
+ cp -f config/aaf-credentials.properties ${POLICY_HOME}/config/aaf-credentials.properties
+ fi
+
+ if [[ -f config/aaf-cadi.keyfile ]]; then
+ cp -f config/aaf-cadi.keyfile ${POLICY_HOME}/config/aaf-cadi.keyfile
+ fi
+
if [[ -f config/drools-tweaks.sh ]] ; then
echo "Executing tweaks"
# file may not be executable; running it as an
diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index 0c440937..dd9e7c56 100644
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -59,6 +59,11 @@ PDPD_CONFIGURATION_CONSUMER_GROUP=
PDPD_CONFIGURATION_CONSUMER_INSTANCE=
PDPD_CONFIGURATION_PARTITION_KEY=
+# AAF
+
+AAF_NAMESPACE=org.onap.policy
+AAF_HOST=aaf-onap-test.osaaf.org
+
# PAP
PAP_HOST=