Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Upgrade APPC to use common mariadb galera charts"
[oom.git]
/
kubernetes
/
appc
/
resources
/
config
/
appc
/
opt
/
onap
/
appc
/
bin
/
startODL.sh
diff --git
a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index
e13193f
..
3cbee8d
100755
(executable)
--- a/
kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/
kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@
-5,6
+5,7
@@
# APPC
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# APPC
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2018 Amdocs,Bell Canada
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-53,8
+54,11
@@
ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
APPC_HOME=${APPC_HOME:-/opt/onap/appc}
SLEEP_TIME=${SLEEP_TIME:-120}
SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
APPC_HOME=${APPC_HOME:-/opt/onap/appc}
SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
+MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.
maria
dbRootPassword}}}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
+ENABLE_AAF=${ENABLE_AAF:-false}
+AAF_EXT_IP=${AAF_EXT_IP:-{{.Values.config.aafExtIP}}}
+AAF_EXT_FQDN=${AAF_EXT_FQDN:-{{.Values.config.aafExtFQDN}}}
appcInstallStartTime=$(date +%s)
appcInstallStartTime=$(date +%s)
@@
-79,13
+83,13
@@
echo "" >> $APPC_HOME/data/properties/appc.properties
#
# Wait for database to init properly
#
#
# Wait for database to init properly
#
-echo "Waiting for m
ysql
"
-until mysql -h {{.Values.
mysql.service.name}}.{{.Release.Namespace}} -u root -p{{.Values.config.
dbRootPassword}} mysql &> /dev/null
+echo "Waiting for m
ariadbgalera
"
+until mysql -h {{.Values.
config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.maria
dbRootPassword}} mysql &> /dev/null
do
printf "."
sleep 1
done
do
printf "."
sleep 1
done
-echo -e "\nm
ysql
ready"
+echo -e "\nm
ariadbgalera
ready"
if [ ! -f ${SDNC_HOME}/.installed ]
then
if [ ! -f ${SDNC_HOME}/.installed ]
then
@@
-143,8
+147,13
@@
then
echo "" >> ${ODL_HOME}/etc/system.properties
echo "Copying the aaa shiro configuration into opendaylight"
echo "" >> ${ODL_HOME}/etc/system.properties
echo "Copying the aaa shiro configuration into opendaylight"
- cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
-
+ if $ENABLE_AAF
+ then
+ echo "${AAF_EXT_IP} ${AAF_EXT_FQDN}" >> /etc/hosts
+ cp ${APPC_HOME}/data/properties/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
+ else
+ cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
+ fi
echo "Restarting OpenDaylight"
${ODL_HOME}/bin/stop
echo "Restarting OpenDaylight"
${ODL_HOME}/bin/stop
@@
-152,7
+161,7
@@
then
running=0
while read a b c d e f g h
do
running=0
while read a b c d e f g h
do
- if [ "$h" == "/bin/sh /opt/opendaylight/
current/
bin/karaf server" ]
+ if [ "$h" == "/bin/sh /opt/opendaylight/bin/karaf server" ]
then
running=1
fi
then
running=1
fi
@@
-173,5
+182,8
@@
fi
appcInstallEndTime=$(date +%s)
echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
appcInstallEndTime=$(date +%s)
echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
-exec ${ODL_HOME}/bin/karaf
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
+exec ${ODL_HOME}/bin/karaf server