[POLICY-8] remove unused functionality

Change-Id: I90737c5510351b1f98c1c31fdcca86d0fdb9b90f
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/config/drools/base.conf b/config/drools/base.conf
index f6c9519..b8e0d0a 100644 (file)
--- a/config/drools/base.conf
+++ b/config/drools/base.conf
@@ -7,35 +7,6 @@ ENGINE_MANAGEMENT_HOST=localhost
 ENGINE_MANAGEMENT_USER=@1b3rt
 ENGINE_MANAGEMENT_PASSWORD=31nst@1n
 
-JDBC_DRIVER=org.mariadb.jdbc.Driver
-JDBC_URL=jdbc:mysql://mariadb:3306/ecomp_sdk
-JDBC_DROOLS_URL=jdbc:mysql://mariadb:3306/drools
-JDBC_USER=policy_user
-JDBC_PASSWORD=policy_user
-
-# Integrity Monitor properties
-site_name=site_1
-fp_monitor_interval=30
-failed_counter_threshold=3
-test_trans_interval=20
-write_fpc_interval=5
-max_fpc_update_interval=60
-test_via_jmx=false
-jmx_fqdn=
-node_type=pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon. 
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon.
-dependency_groups=
-resource_name=pdpd_1
-
-# The (optional) period of time in seconds between executions of the integrity audit.
-# Value < 0 : Audit does not run (default value if property is not present = -1)
-# Value = 0 : Audit runs continuously
-# Value > 0 : The period of time in seconds between execution of the audit on a particular node
-integrity_audit_period_seconds=-1
-
-host_port=0.0.0.0:9981
-
 # To use a Nexus repository for rules artifacts,
 # following properties must be uncommented and set:
 snapshotRepositoryID=policy-nexus-snapshots

diff --git a/policy-drools/do-start.sh b/policy-drools/do-start.sh
index 0d57d83..7fead2f 100644 (file)
--- a/policy-drools/do-start.sh
+++ b/policy-drools/do-start.sh
@@ -35,11 +35,8 @@ else
 
        # wait for DB up
        ./wait-for-port.sh mariadb 3306
-       # now that DB is up, invoke database upgrade
-       # (which does nothing if the db is already up-to-date)
-       dbuser=$(echo $(grep '^JDBC_USER=' base.conf | cut -f2 -d=))
-       dbpw=$(echo $(grep '^JDBC_PASSWORD=' base.conf | cut -f2 -d=))
-       db_upgrade_droolspdp_remote.sh $dbuser $dbpw mariadb
+       # now that DB is up, invoke database upgrade:
+       # sql provisioning scripts should be invoked here.
 fi
 
 echo "Starting processes"

diff --git a/policy-drools/docker-install.sh b/policy-drools/docker-install.sh
index fd92064..bfe83b8 100644 (file)
--- a/policy-drools/docker-install.sh
+++ b/policy-drools/docker-install.sh
@@ -820,7 +820,6 @@ function do_install()
        # install features
        SOURCE_DIR=$PWD
        cd $POLICY_HOME
-       jar xf ${SOURCE_DIR}/policy-persistence-*.zip
        jar xf ${SOURCE_DIR}/policy-healthcheck-*.zip
        cd ${SOURCE_DIR}