diff options
Diffstat (limited to 'engine-d-standalone')
| -rw-r--r-- | engine-d-standalone/pom.xml | 6 | ||||
| -rw-r--r-- | engine-d-standalone/src/main/assembly/bin/run.sh | 31 | ||||
| -rw-r--r-- | engine-d-standalone/src/main/assembly/conf/application.yaml | 23 |
3 files changed, 44 insertions, 16 deletions
diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml index 5a56c18..e5a84e0 100644 --- a/engine-d-standalone/pom.xml +++ b/engine-d-standalone/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.holmes.engine-management</groupId> <artifactId>holmes-engine-parent</artifactId> - <version>1.3.7-SNAPSHOT</version> + <version>1.3.8-SNAPSHOT</version> </parent> <artifactId>holmes-engine-d-standalone</artifactId> @@ -60,6 +60,7 @@ </executions> <configuration> <outputDirectory>${linux64outputdir}/lib</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> <includeScope>runtime</includeScope> </configuration> </plugin> @@ -87,6 +88,9 @@ </resource> <resource> <directory>../engine-d/src/main/resources</directory> + <excludes> + <exclude>logback-spring.xml</exclude> + </excludes> <filtering>false</filtering> </resource> </resources> diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 55f58dd..2c58d35 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -47,13 +47,19 @@ if [ -z ${DB_NAME} ]; then echo "No database is name is specified. Use the default value \"$DB_NAME\"." fi +export DB_PORT=5432 +if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then + export DB_PORT="${URL_JDBC##*:}" +fi +echo DB_PORT=$DB_PORT + # if deployed using helm, use the helm-generated configuration file. if [ -d /opt/hemconfig ]; then - cp /opt/hemconfig/engine-d.yml "$main_path/conf/engine-d.yml" + cp /opt/hemconfig/application.yaml "$main_path/conf/application.yaml" else - sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC/$DB_NAME|" "$main_path/conf/engine-d.yml" - sed -i "s|user:.*|user: $JDBC_USERNAME|" "$main_path/conf/engine-d.yml" - sed -i "s|password:.*|password: $JDBC_PASSWORD|" "$main_path/conf/engine-d.yml" + sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC:$DB_PORT/$DB_NAME|" "$main_path/conf/application.yaml" + sed -i "s|username:.*|username: $JDBC_USERNAME|" "$main_path/conf/application.yaml" + sed -i "s|password:.*|password: $JDBC_PASSWORD|" "$main_path/conf/application.yaml" fi export SERVICE_IP=`hostname -i | awk '{print $1}'` @@ -65,18 +71,12 @@ else export HOSTNAME=${SERVICE_IP}:9102 fi -export DB_PORT=5432 -if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then - export DB_PORT="${URL_JDBC##*:}" -fi -echo DB_PORT=$DB_PORT - if [ -z ${ENABLE_ENCRYPT} ]; then export ENABLE_ENCRYPT=true fi echo ENABLE_ENCRYPT=$ENABLE_ENCRYPT -KEY_PATH="/opt/onap/conf/holmes.keystore" +KEY_PATH="$main_path/conf/holmes.keystore" KEY_PASSWORD="holmes" if [ -f "/opt/app/osaaf/local/org.onap.holmes-engine-mgmt.p12" ]; then @@ -88,8 +88,8 @@ echo "KEY_PATH=$KEY_PATH" echo "KEY_PASS=$KEY_PASSWORD" #HTTPS Configurations -sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/engine-d.yml" -sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/engine-d.yml" +sed -i "s|key-store:.*|key-store: $KEY_PATH|" "$main_path/conf/application.yaml" +sed -i "s|key-store-password:.*|key-store-password: $KEY_PASSWORD|" "$main_path/conf/application.yaml" if [ "${ENABLE_ENCRYPT}"x = "true"x ]; then sed -i "s|type:\s*https\?$|type: https|" "$main_path/conf/engine-d.yml" @@ -105,9 +105,10 @@ else sed -i "s|#\?validatePeers|#validatePeers|" "$main_path/conf/engine-d.yml" fi -cat "$main_path/conf/engine-d.yml" +cat "$main_path/conf/application.yaml" ${RUNHOME}/initDB.sh "$JDBC_USERNAME" "$JDBC_PASSWORD" "$DB_NAME" "$DB_PORT" "${URL_JDBC%:*}" -"$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.engine.EngineDActiveApp server "$main_path/conf/engine-d.yml" +JAR=`ls -lt $main_path/lib | grep -e "holmes-engine-.*jar$" | awk '{print $9}'` +"$JAVA" $JAVA_OPTS -jar "$main_path/lib/$JAR" -classpath "$class_path" --spring.config.location="$main_path/conf/application.yaml" diff --git a/engine-d-standalone/src/main/assembly/conf/application.yaml b/engine-d-standalone/src/main/assembly/conf/application.yaml new file mode 100644 index 0000000..ed760ed --- /dev/null +++ b/engine-d-standalone/src/main/assembly/conf/application.yaml @@ -0,0 +1,23 @@ +server: + port: 9102 + servlet: + context-path: /api/holmes-engine-mgmt/v1 + ssl: + key-store: /opt/onap/conf/holmes.keystore + key-store-password: holmes + #PKCS12 + key-store-type: JKS + +logging: + config: classpath:logback-spring.xml + +spring: + application: + name: Holmes Engine Management + datasource: + dirver-class-name: org.postgresql.Driver + url: jdbc:postgresql://localhost:5432/holmes + username: holmes + password: holmespwd + mvc: + throw-exception-if-no-handler-found: true
\ No newline at end of file |