X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2Fdocker-install.sh;h=3700e57310debbac1136f0fe46b50526221205bc;hb=e1f88b91981a22cc63019d1d6b73089566425383;hp=f76557928e4493f65f383b578216e2e55beabc13;hpb=e67481ed648c419a1645d0fc8b98506fe544a454;p=policy%2Fengine.git

diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index f76557928..3700e5731 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -169,6 +169,7 @@ function configure_component() {
 	SED_LINE+=" -e 's!\${{POLICY_USER}}!${POLICY_USER}!g' "
 	SED_LINE+=" -e 's!\${{POLICY_GROUP}}!${POLICY_GROUP}!g' "
 	SED_LINE+=" -e 's!\${{KEYSTORE_PASSWD}}!${KEYSTORE_PASSWD}!g' "
+	SED_LINE+=" -e 's!\${{TRUSTSTORE_PASSWD}}!${TRUSTSTORE_PASSWD}!g' "
 	SED_LINE+=" -e 's!\${{JAVA_HOME}}!${JAVA_HOME}!g' "
 	SED_LINE+=" -e 's!\${{COMPONENT_TYPE}}!${COMPONENT_TYPE}!g' "
 	SED_LINE+=" -e 's!\${{POLICY_LOGS}}!${POLICY_LOGS}!g' "
@@ -404,11 +405,16 @@ function configure_keystore() {
 		set -x
 	fi
 
-    local DEFAULT_KEYSTORE_PASSWORD="Pol1cy_0nap"
+    local DEFAULT_KEYSTORE_PASSWORD='Pol1cy_0nap'
+
+	if [[ -n ${TRUSTSTORE_PASSWD} ]]; then
+	    keytool -storepasswd -storepass "${DEFAULT_KEYSTORE_PASSWORD}" -keystore "${POLICY_HOME}/etc/ssl/policy-truststore" -new "${TRUSTSTORE_PASSWD}"
+	    keytool -list -keystore "${POLICY_HOME}/etc/ssl/policy-truststore" -storepass "${TRUSTSTORE_PASSWD}"
+	fi
 
 	if [[ -n ${KEYSTORE_PASSWD} ]]; then
-	    keytool -storepasswd -storepass ${DEFAULT_KEYSTORE_PASSWORD} -keystore ${POLICY_HOME}/etc/ssl/policy-keystore -new ${KEYSTORE_PASSWD}
-	    keytool -list -keystore ${POLICY_HOME}/etc/ssl/policy-keystore -storepass ${KEYSTORE_PASSWD}
+	    keytool -storepasswd -storepass "${DEFAULT_KEYSTORE_PASSWORD}" -keystore "${POLICY_HOME}/etc/ssl/policy-keystore" -new "${KEYSTORE_PASSWD}"
+	    keytool -list -keystore "${POLICY_HOME}/etc/ssl/policy-keystore" -storepass "${KEYSTORE_PASSWD}"
 	fi
 }
 
@@ -469,22 +475,7 @@ function configure_mysql() {
 		set -x
 	fi
 	
-	# get user/pass/host from base.conf 
-	if ! check_r_file "${BASE_CONF}"; then
-	     echo "error: aborting ${COMPONENT_TYPE} installation: ${BASE_CONF} is not accessible"
-	     exit 1
-	fi
-	DB_USER=`grep "^JDBC_USER=" ${BASE_CONF}     | awk -F'=' '{print $2}'`
-	DB_PASS=`grep "^JDBC_PASSWORD=" ${BASE_CONF} | awk -F'=' '{print $2}'`
-	DB_HOST=`grep "^JDBC_URL=" ${BASE_CONF}      | awk -F'=' '{print $2}' | awk -F':' '{print $3}' | sed -e"s/\///g"`
-	echo "Perform DB schema upgrade on: $DB_HOST"
-	if ! check_x_file "${POLICY_HOME}/bin/db_upgrade_remote.sh"; then
-	     echo "error: ${POLICY_HOME}/bin/db_upgrade_remote.sh is not accessible"
-	     exit 1
-	else
-	     ${POLICY_HOME}/bin/db_upgrade_remote.sh "${DB_USER}" "${DB_PASS}" "${DB_HOST}"
-	fi
-	return 0
+	# nothing to do
 }
 
 # This function installs elk related shell scripts and sql files in the proper locations
@@ -637,7 +628,7 @@ DEBUG=n
 
 BASE_CONF=base.conf
 
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.50
+TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.53
 
 INSTALL_DIR="$(pwd)"