Browse code

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

Jenkins authored on 2014/04/11 20:18:19
Showing 1 changed files
... ...
@@ -1004,9 +1004,13 @@ if is_service_enabled n-net q-dhcp; then
1004 1004
     fi
1005 1005
 
1006 1006
     clean_iptables
1007
-    rm -rf ${NOVA_STATE_PATH}/networks
1008
-    sudo mkdir -p ${NOVA_STATE_PATH}/networks
1009
-    safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks
1007
+
1008
+    if is_service_enabled n-net; then
1009
+        rm -rf ${NOVA_STATE_PATH}/networks
1010
+        sudo mkdir -p ${NOVA_STATE_PATH}/networks
1011
+        safe_chown -R ${USER} ${NOVA_STATE_PATH}/networks
1012
+    fi
1013
+
1010 1014
     # Force IP forwarding on, just in case
1011 1015
     sudo sysctl -w net.ipv4.ip_forward=1
1012 1016
 fi