Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update for ODL Aluminum
[sdnc/oam.git]
/
installation
/
sdnc
/
src
/
main
/
scripts
/
addIpAddresses.sh
diff --git
a/installation/sdnc/src/main/scripts/addIpAddresses.sh
b/installation/sdnc/src/main/scripts/addIpAddresses.sh
index
6a29d47
..
a990545
100755
(executable)
--- a/
installation/sdnc/src/main/scripts/addIpAddresses.sh
+++ b/
installation/sdnc/src/main/scripts/addIpAddresses.sh
@@
-1,8
+1,8
@@
-#!/bin/sh
+#!/bin/
ba
sh
-
MYSQL_USER=${MYSQL
_USER:-sdnctl}
-
MYSQL_PWD=${MYSQL_PW
D:-gamma}
-
MYSQL_DB=${MYSQL_DB
:-sdnctl}
+
SDNC_DB_USER=${SDNC_DB
_USER:-sdnctl}
+
SDNC_DB_PASSWORD=${SDNC_DB_PASSWOR
D:-gamma}
+
SDNC_DB_DATABASE=${SDNC_DB_DATABASE
:-sdnctl}
MYSQL_HOST=${MYSQL_HOST:-dbhost}
universe=$1
MYSQL_HOST=${MYSQL_HOST:-dbhost}
universe=$1
@@
-11,7
+11,7
@@
start=$3
if [ $# -eq 3 ]
then
if [ $# -eq 3 ]
then
- mysql --user=${
MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB
} <<EOF
+ mysql --user=${
SDNC_DB_USER} --password=${SDNC_DB_PASSWORD} --host=${MYSQL_HOST} ${SDNC_DB_DATABASE
} <<EOF
INSERT INTO IPV4_ADDRESS_POOL VALUES('', '$universe', 'AVAILABLE', '${subnet}.${start}');
EOF
elif [ $# -eq 4 ]
INSERT INTO IPV4_ADDRESS_POOL VALUES('', '$universe', 'AVAILABLE', '${subnet}.${start}');
EOF
elif [ $# -eq 4 ]
@@
-21,7
+21,7
@@
then
while [ $ip -le $stop ]
do
while [ $ip -le $stop ]
do
- mysql --user=${
MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB
} <<EOF
+ mysql --user=${
SDNC_DB_USER} --password=${SDNC_DB_PASSWORD} --host=${MYSQL_HOST} ${SDNC_DB_DATABASE
} <<EOF
INSERT INTO IPV4_ADDRESS_POOL VALUES('', '$universe', 'AVAILABLE','${subnet}.${ip}');
EOF
ip=$(( ip+1 ))
INSERT INTO IPV4_ADDRESS_POOL VALUES('', '$universe', 'AVAILABLE','${subnet}.${ip}');
EOF
ip=$(( ip+1 ))