Merge "only remove network states from Nova when n-net is enabled"

This commit is contained in:
Jenkins 2014-04-11 11:18:19 +00:00 committed by Gerrit Code Review
commit b8071e9ba9

View File

@ -1004,9 +1004,13 @@ if is_service_enabled n-net q-dhcp; then
fi fi
clean_iptables clean_iptables
if is_service_enabled n-net; then
rm -rf ${NOVA_STATE_PATH}/networks rm -rf ${NOVA_STATE_PATH}/networks
sudo mkdir -p ${NOVA_STATE_PATH}/networks sudo mkdir -p ${NOVA_STATE_PATH}/networks
safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks
fi
# Force IP forwarding on, just in case # Force IP forwarding on, just in case
sudo sysctl -w net.ipv4.ip_forward=1 sudo sysctl -w net.ipv4.ip_forward=1
fi fi