diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2017-05-12 17:43:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-05-12 17:43:47 +0000 |
| commit | da2b69dd5333ecc5e769985d5d53210188bed230 (patch) | |
| tree | 707417eba5d7af6e704c8f32f956b8a94a4c20f9 | |
| parent | 5e1f8a706d0f4e2fbb4a0b857e5b40659f97af94 (diff) | |
| parent | e9ada29d385dff4e61a14c92652cc74071a91df5 (diff) | |
Merge "Policy Docker pe fixes"
| -rw-r--r-- | config/pe/base.conf | 2 | ||||
| -rw-r--r-- | config/pe/brmsgw.conf | 6 | ||||
| -rw-r--r-- | config/pe/pdp.conf | 4 | ||||
| -rw-r--r-- | policy-pe/docker-install.sh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/config/pe/base.conf b/config/pe/base.conf index fc1718fb..6734b4da 100644 --- 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 f9188478..2efa456a 100644 --- 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 7248717d..6db448bc 100644 --- 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 140947da..57c26bf5 100644 --- 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) ;; |