aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocker/instance_config.sh12
-rwxr-xr-xdocker/instance_init.sh56
2 files changed, 23 insertions, 45 deletions
diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index 1739be24..64b69ec9 100755
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -18,17 +18,15 @@ fi
MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
echo "MYSQL_ADDR=$MYSQL_ADDR"
-MYSQL_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
-MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
-REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
-REDIS_PORT=`echo $REDIS_ADDR | cut -d: -f 2`
+if [ $REDIS_ADDR ]; then
+ REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
+else
+ REDIS_IP="$MYSQL_ADDR"
+fi
sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py
sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/nfvo/catalog/catalog/pub/config/config.py
sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-sed -i "s|REDIS_PORT.*|REDIS_PORT = '$REDIS_PORT'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-sed -i "s|DB_USER.*|DB_USER = '$MYSQL_USER'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-sed -i "s|DB_PASSWD.*|DB_PASSWD = '$MYSQL_ROOT_PASSWORD'|" vfc/nfvo/catalog/catalog/pub/config/config.py
cat vfc/nfvo/catalog/catalog/pub/config/config.py
diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 64b8e864..d6ddbf60 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -1,51 +1,31 @@
#!/bin/bash
-if [ ! -f /var/log/onap/vfc/catalog/runtime_catalog.log ]; then
- mkdir -p /var/log/onap/vfc/catalog
- touch /var/log/onap/vfc/catalog/runtime_catalog.log
-else
- echo >/var/log/onap/vfc/catalog/runtime_catalog.log
-fi
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-if [ ! -f /service/vfc/nfvo/catalog/resources/bin/logs/runtime_catalog.log ]; then
- mkdir -p /service/vfc/nfvo/catalog/resources/bin/logs
- touch /service/vfc/nfvo/catalog/resources/bin/logs/runtime_catalog.log
+if [ $MYSQL_AUTH ]; then
+ MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
+ MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
else
- echo >/service/vfc/nfvo/catalog/resources/bin/logs/runtime_catalog.log
+ MYSQL_ROOT_USER="root"
+ MYSQL_ROOT_PASSWORD="root"
fi
-MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-MYSQL_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
-MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
-
function create_database {
cd /service/vfc/nfvo/catalog/resources/bin
- bash initDB.sh $MYSQL_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
-
- man_path=/service/vfc/nfvo/catalog
-
- tab=`mysql -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} -P${MYSQL_PORT} -h${MYSQL_IP} -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='nfvocatalog';"`
- tab1=`echo $tab |awk '{print $2}'`
+ bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
- echo "TABLE NOT EXISTS, START MIGRATE"
- python $man_path/manage.py makemigrations database && python $man_path/manage.py migrate database &
- wait
- tab2=`mysql -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} -P${MYSQL_PORT} -h${MYSQL_IP} -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='nfvocatalog';"`
- tab3=`echo $tab2|awk '{print $2}'`
- if [ $tab3 -gt 0 ] ; then
- echo "TABLE CREATE SUCCESSFUL"
- fi
-else
- echo "table already existed"
- exit 1
-fi
}
-if [ ! -f /service/vfc/nfvo/catalog/docker/db.txt ]; then
- echo 1 > /service/vfc/nfvo/catalog/docker/db.txt
-
+function migrate_database {
+ cd /service/vfc/nfvo/catalog
+ python manage.py makemigrations database
+ python manage.py migrate
+}
+
+cd /service
+if [ ! -f dbexist.txt ]; then
+ echo 1 > dbexist.txt
create_database
-else
- echo "database already existed"
+ migrate_database
fi