Browse code

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

When n-net is not enabled but q-dhcp is enabled then it's not
necessary to remove the states directory of nova-network.

Change-Id: Ib4b37aa7df2b3cda3048b278ddad24e87e3744c9

Christian Berendt authored on 2014/04/07 22:31:07
Showing 1 changed files
... ...
@@ -1001,9 +1001,13 @@ if is_service_enabled n-net q-dhcp; then
1001 1001
     fi
1002 1002
 
1003 1003
     clean_iptables
1004
-    rm -rf ${NOVA_STATE_PATH}/networks
1005
-    sudo mkdir -p ${NOVA_STATE_PATH}/networks
1006
-    safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks
1004
+
1005
+    if is_service_enabled n-net; then
1006
+        rm -rf ${NOVA_STATE_PATH}/networks
1007
+        sudo mkdir -p ${NOVA_STATE_PATH}/networks
1008
+        safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks
1009
+    fi
1010
+
1007 1011
     # Force IP forwarding on, just in case
1008 1012
     sudo sysctl -w net.ipv4.ip_forward=1
1009 1013
 fi