From faed52cdedf1b067c3f39d49827cb843d55edd45 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Fri, 14 Oct 2016 06:11:07 +0800 Subject: Add recovery scripts - add recovery shell scripts - add boot-recovery role to stop services during system boot which could cause boot pending - configure nfs mount in /etc/fstab cause system boot pending, so mount nfs during ansible-playbook run. - kill mysqld before mysql recovery, running mysqld may cause mysql recover failure JIRA: COMPASS-474 Change-Id: I0f6f0ee935fbe3fbbe28a451a02decfb01a6165b Signed-off-by: QiLiang --- deploy/network.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'deploy/network.sh') diff --git a/deploy/network.sh b/deploy/network.sh index 46b8c023..6c678222 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -29,6 +29,13 @@ function setup_bridge_net() sudo virsh net-start $net_name } +function recover_bridge_net() +{ + net_name=$1 + + sudo virsh net-start $net_name +} + function save_network_info() { sudo ovs-vsctl list-br |grep br-external @@ -69,6 +76,13 @@ function setup_bridge_external() python $COMPASS_DIR/deploy/setup_vnic.py } +function recover_bridge_external() +{ + sudo virsh net-start external + + python $COMPASS_DIR/deploy/setup_vnic.py +} + function setup_nat_net() { net_name=$1 gw=$2 @@ -92,11 +106,20 @@ function setup_nat_net() { sudo virsh net-start $net_name } +function recover_nat_net() { + net_name=$1 + + sudo virsh net-start $net_name +} function setup_virtual_net() { setup_nat_net install $INSTALL_GW $INSTALL_MASK } +function recover_virtual_net() { + recover_nat_net install +} + function setup_baremetal_net() { if [[ -z $INSTALL_NIC ]]; then exit 1 @@ -104,6 +127,13 @@ function setup_baremetal_net() { setup_bridge_net install $INSTALL_NIC } +function recover_baremetal_net() { + if [[ -z $INSTALL_NIC ]]; then + exit 1 + fi + recover_bridge_net install +} + function setup_network_boot_scripts() { sudo cp $COMPASS_DIR/deploy/network.sh /usr/sbin/network_setup sudo chmod +777 /usr/sbin/network_setup @@ -134,3 +164,14 @@ function create_nets() { setup_network_boot_scripts } +function recover_nets() { + recover_nat_net mgmt + + # recover install network + recover_"$TYPE"_net + + # recover external network + recover_bridge_external + clear_forward_rejct_rules +} + -- cgit 1.2.3-korg