Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change the value of the password after obtaining encryption and fix some typo error...
[vfc/gvnfm/vnflcm.git]
/
lcm
/
docker
/
instance_init.sh
diff --git
a/lcm/docker/instance_init.sh
b/lcm/docker/instance_init.sh
index
88a9c4e
..
aa04c5d
100755
(executable)
--- a/
lcm/docker/instance_init.sh
+++ b/
lcm/docker/instance_init.sh
@@
-3,12
+3,12
@@
MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-if [ $MYSQL_
AUTH
]; then
- MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
- MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
+if [ $MYSQL_
ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD
]; then
+ MYSQL_ROOT_USER=$MYSQL_ROOT_USER
+ MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
else
else
- MYSQL_ROOT_USER="root"
- MYSQL_ROOT_PASSWORD="root"
+
MYSQL_ROOT_USER="root"
+
MYSQL_ROOT_PASSWORD="root"
fi
function create_database {
fi
function create_database {
@@
-18,15
+18,8
@@
function create_database {
function migrate_database {
cd /service/vfc/gvnfm/vnflcm/lcm
function migrate_database {
cd /service/vfc/gvnfm/vnflcm/lcm
- python manage.py makemigrations database
- python manage.py migrate --fake
python manage.py migrate
}
python manage.py migrate
}
-GET_VNFM_DB="show databases like 'gvnfm';"
-VNFM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "$GET_VNFM_DB"`
-if [[ "$VNFM_DB" == "" ]]; then
- create_database
-
-fi
+create_database
migrate_database
migrate_database