From 2c1ee148029624def1bcf5fcec98c1a87b8d2899 Mon Sep 17 00:00:00 2001 From: zhangni Date: Sat, 29 Nov 2014 18:47:32 +0800 Subject: [PATCH] modify install.sh of neutron_cascading_l3_patch Change-Id: Iff5df0afba69be30f2fd94a4ad7698e0551e0b5d --- .../neutron_cascading_l3_patch/installation/install.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/juno-patches/neutron/neutron_cascading_l3_patch/installation/install.sh b/juno-patches/neutron/neutron_cascading_l3_patch/installation/install.sh index bf670de5..61dd453d 100644 --- a/juno-patches/neutron/neutron_cascading_l3_patch/installation/install.sh +++ b/juno-patches/neutron/neutron_cascading_l3_patch/installation/install.sh @@ -133,6 +133,16 @@ sed -i "s/USER_NAME/$USER_NAME/g" "${_NEUTRON_CONF_DIR}/${_NEUTRON_L2_PROXY_FILE sed -i "s/USER_PWD/$USER_PWD/g" "${_NEUTRON_CONF_DIR}/${_NEUTRON_L2_PROXY_FILE}" sed -i "s/TENANT_NAME/$TENANT_NAME/g" "${_NEUTRON_CONF_DIR}/${_NEUTRON_L2_PROXY_FILE}" +echo "upgrade and syc neutron DB for cascading-server-l3-patch..." +_MYSQL_PASS='openstack' +exec_sql_str="DROP DATABASE if exists neutron;CREATE DATABASE neutron;GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'%' IDENTIFIED BY \"$_MYSQL_PASS\";GRANT ALL PRIVILEGES ON *.* TO 'neutron'@'%'IDENTIFIED BY \"$_MYSQL_PASS\";" +mysql -u root -p$_MYSQL_PASS -e "$exec_sql_str" +neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head +if [ $? -ne 0 ] ; then + echo "There was an error in upgrading DB for cascading-server-l3-patch, please check cascacaded neutron server code manually." + exit 1 +fi + echo "restarting cascading neutron server..." service neutron-server restart if [ $? -ne 0 ] ; then