Policy Docker pe fixes

Change-Id: I6681372eb54b79361311d294512bbf8ac8eb33e7
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

diff --git a/config/pe/base.conf b/config/pe/base.conf
index fc1718f..6734b4d 100644 (file)
--- a/config/pe/base.conf
+++ b/config/pe/base.conf
@@ -1,8 +1,6 @@
 JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 POLICY_HOME=/opt/app/policy
 KEYSTORE_PASSWD=PolicyR0ck$
-KEY_PASSWD=PolicyR0ck$
-TRUSTSTORE_PASSWD=PolicyR0ck$
 
 JDBC_DRIVER=org.mariadb.jdbc.Driver
 JDBC_URL=jdbc:mariadb://mariadb:3306/ecomp_sdk

diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf
index f918847..2efa456 100644 (file)
--- a/config/pe/brmsgw.conf
+++ b/config/pe/brmsgw.conf
@@ -38,8 +38,7 @@ VDNS_ARTIFACT_ID=policy-vDNS-rules
 resource_name=brmsgw_1
 node_type=brms_gateway
 
-CLIENT_ID=PyPDPServer
-CLIENT_KEY=test
+#Environment should be Set either DEV, TEST or PROD
 ENVIRONMENT=TEST
 
 #Notification Properties... type can be either websocket, ueb, or dmaap
@@ -52,3 +51,6 @@ BRMS_CLIENT_KEY=
 BRMS_UEB_API_KEY=
 BRMS_UEB_API_SECRET=
 
+#Dependency.json file version
+BRMS_DEPENDENCY_VERSION=1.1.0-SNAPSHOT
+

diff --git a/config/pe/pdp.conf b/config/pe/pdp.conf
index 7248717..6db448b 100644 (file)
--- a/config/pe/pdp.conf
+++ b/config/pe/pdp.conf
@@ -37,8 +37,8 @@ test_via_jmx=true
 
 #
 # Notification Properties
-# Notifcation type: websocket, ueb or dmaap... if left blank websocket is the default
-PDP_NOTIFICATION_TYPE=websocket,UEB
+# Notification type: websocket, ueb or dmaap... if left blank websocket is the default
+PDP_NOTIFICATION_TYPE=websocket
 PDP_UEB_CLUSTER=
 PDP_UEB_TOPIC=
 PDP_UEB_DELAY=

diff --git a/policy-pe/docker-install.sh b/policy-pe/docker-install.sh
index 140947d..57c26bf 100644 (file)
--- a/policy-pe/docker-install.sh
+++ b/policy-pe/docker-install.sh
@@ -466,6 +466,7 @@ function install_brmsgw() {
        /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/BRMSGateway.jar "${POLICY_HOME}/servers/${COMPONENT_TYPE}"
        /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/*.properties "${POLICY_HOME}/servers/${COMPONENT_TYPE}"
        /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/config "${POLICY_HOME}/servers/${COMPONENT_TYPE}"
+       /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/dependency.json "${POLICY_HOME}/servers/${COMPONENT_TYPE}"
        
        /bin/mv $POLICY_HOME/m2 $HOME/.m2
 
@@ -541,7 +542,6 @@ done
 # component-type validation
 case $COMPONENT_TYPE in
        base)   ;;
-       pypdp)  ;;
        pdp)    ;;
        pap)    ;;
        console)        ;;