diff options
| author |   dglFromAtt <dgl@research.att.com> | 2018-03-21 08:28:10 -0400 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2018-03-21 08:28:22 -0400 |
| commit | 24e3448b4673674e2fbd4e55603b1b67ac052182 (patch) | |
| tree | 85c4e4f4906b67a5ecaefd3ca095dc2b0a94495f /misc | |
| parent | f5cede4c4defaf0d04a07a297df51549799be0c1 (diff) | |
Modify for k8s deployment compatibility
There was a problem with signature using shade.
Also simplified start script for k8s
Change-Id: I8c3cda5d20a0db9840301168baea3c4b6606c9c4
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-117
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dmaapbc | 27 | ||||
| -rw-r--r-- | misc/dmaapbc.properties.tmpl | 6 |
2 files changed, 14 insertions, 19 deletions
diff --git a/misc/dmaapbc b/misc/dmaapbc index 19bb3f7..6b337db 100644 --- a/misc/dmaapbc +++ b/misc/dmaapbc @@ -15,9 +15,9 @@ MAIN=org.onap.dmaap.dbcapi.server.Main pids() { - #set -x + set -x ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//' - #set +x + set +x } config() { @@ -81,22 +81,10 @@ start() { # JVM flags #old line from Dockerfile...keep for reference only FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 & + #nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 & + nohup java $FLAGS $MAIN </dev/null & sleep 5 PIDS=`pids` - if [ "$PIDS" = "" ] - then - echo $COMPONENT startup failed - ls -l $APP_ROOT/logs/EELF - echo "------------ error.log ---------------" - cat $APP_ROOT/logs/EELF/error.log - echo "------------ server.log ---------------" - cat $APP_ROOT/logs/EELF/server.log - echo "------------ tail -100 application.log ---------------" - tail -100 $APP_ROOT/logs/EELF/application.log - else - echo $COMPONENT started - fi set +x } @@ -162,4 +150,11 @@ case "$1" in exit 1 ;; esac + ls -l $APP_ROOT/logs/EELF + echo "------------ tail -100 error.log ---------------" + tail -100 $APP_ROOT/logs/EELF/error.log + echo "------------ tail -100 server.log ---------------" + tail -100 $APP_ROOT/logs/EELF/server.log + echo "------------ tail -100 application.log ---------------" + tail -100 $APP_ROOT/logs/EELF/application.log exit 0 diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl index 5b7ee28..e288518 100644 --- a/misc/dmaapbc.properties.tmpl +++ b/misc/dmaapbc.properties.tmpl @@ -20,7 +20,7 @@ IntHttpPort: ${DMAAPBC_INT_HTTP_PORT:-8080} # The port number for https as seen within the server # Set to 0 if no certificate is available yet... # -IntHttpsPort: ${DMAAPBC_INT_HTTPS_PORT:-8443} +IntHttpsPort: ${DMAAPBC_INT_HTTPS_PORT:-0} # # The external port number for https taking port mapping into account # @@ -60,7 +60,7 @@ QuiesceFile: etc/SHUTDOWN # # Enable postgress # -UsePGSQL: ${DMAAPBC_PG_ENABLED:-true} +UsePGSQL: ${DMAAPBC_PG_ENABLED:-false} # # The host for postgres access # @@ -89,7 +89,7 @@ Feed.deleteHandling: ${DMAAPBC_FEED_DELETE:-DeleteOnDR} # Value of the CNAME DNS entry which resolves to the primary central MR cluster (when there are more than one central clusters). # if there is only one MR cluster in an environment, set this to the DNS name for that cluster # -MR.CentralCname: ${DMAAPBC_MR_CNAME:-notSet.onap.org} +MR.CentralCname: ${DMAAPBC_MR_CNAME:-dmaap.onap} # # MR Client Delete Level thoroughness: # 0 = don't delete |