Init DB Using envsubst

Change-Id: Idefe8a70f9ca2634516cf9212372e74505ad91cd
Issue-ID: HOLMES-396
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/engine-d-standalone/src/main/assembly/bin/initDB.sh b/engine-d-standalone/src/main/assembly/bin/initDB.sh
index 9571e59..3d2e8bc 100644 (file)
--- a/engine-d-standalone/src/main/assembly/bin/initDB.sh
+++ b/engine-d-standalone/src/main/assembly/bin/initDB.sh
@@ -26,7 +26,7 @@ echo "Initializing the holmes engine management database..."
 main_path=$HOME/..
 
 # if deployed using helm, use the helm-generated configuration file.
 main_path=$HOME/..
 
 # if deployed using helm, use the helm-generated configuration file.

-if [[ -d /opt/hemconfig ]]; then
+if [ -d /opt/hemconfig ]; then

     cp /opt/hemconfig/onap-holmes_engine-createobj.sql "$main_path/dbscripts/postgresql/onap-holmes_engine-createobj.sql"
 else
     sed -i "s|DBNAME|$dbname|g" "$main_path/dbscripts/postgresql/onap-holmes_engine-createobj.sql"
     cp /opt/hemconfig/onap-holmes_engine-createobj.sql "$main_path/dbscripts/postgresql/onap-holmes_engine-createobj.sql"
 else
     sed -i "s|DBNAME|$dbname|g" "$main_path/dbscripts/postgresql/onap-holmes_engine-createobj.sql"


@@ -42,7 +42,7 @@ echo "password=$password"
 echo "port=$port"
 echo "host=$host"
 
 echo "port=$port"
 echo "host=$host"
 

-if [[ -z `env | grep PGPASSWORD` ]]; then
+if [ -z `env | grep PGPASSWORD` ]; then

     export PGPASSWORD=$password
     need_unset=1
 fi
     export PGPASSWORD=$password
     need_unset=1
 fi


@@ -51,7 +51,7 @@ psql -U "$user" -p "$port" -h "$host" -d "$dbname" -f $main_path/dbscripts/postg
 psql -U "$user" -p "$port" -h "$host" -d "$dbname" --command 'select * from alarm_info;'
 sql_result=$?
 
 psql -U "$user" -p "$port" -h "$host" -d "$dbname" --command 'select * from alarm_info;'
 sql_result=$?
 

-if [[ $need_unset -eq 1 ]]; then
+if [ $need_unset -eq 1 ]; then

     unset PGPASSWORD
 fi
 
     unset PGPASSWORD
 fi
 

diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh
index 0969273..4a528d8 100644 (file)
--- a/engine-d-standalone/src/main/assembly/bin/run.sh
+++ b/engine-d-standalone/src/main/assembly/bin/run.sh
@@ -49,7 +49,7 @@ if [ -z ${DB_NAME} ]; then
 fi
 
 # if deployed using helm, use the helm-generated configuration file.
 fi
 
 # if deployed using helm, use the helm-generated configuration file.

-if [[ -d /opt/hemconfig ]]; then
+if [ -d /opt/hemconfig ]; then

     cp /opt/hemconfig/engine-d.yml "$main_path/conf/engine-d.yml"
 else
     sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC/$DB_NAME|" "$main_path/conf/engine-d.yml"
     cp /opt/hemconfig/engine-d.yml "$main_path/conf/engine-d.yml"
 else
     sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC/$DB_NAME|" "$main_path/conf/engine-d.yml"