diff --git a/contrib/nova.sh b/contrib/nova.sh
index 3a895552627c..1f36d7f89f71 100755
--- a/contrib/nova.sh
+++ b/contrib/nova.sh
@@ -89,6 +89,9 @@ if [ "$CMD" == "install" ]; then
 #For IPV6
     sudo apt-get install -y python-netaddr 
     sudo apt-get install -y radvd
+#(Nati) Note that this configuration is only needed for nova-network node.
+    sudo bash -c "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding"
+    sudo bash -c "echo 0 > /proc/sys/net/ipv6/conf/all/accept_ra"
     
     if [ "$USE_MYSQL" == 1 ]; then
         cat <<MYSQL_PRESEED | debconf-set-selections
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 6779316036bd..891e9bc1d78e 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -124,11 +124,6 @@ def init_host():
                   (FLAGS.fixed_range, FLAGS.dmz_cidr))
     _confirm_rule("POSTROUTING", "-t nat -s %(range)s -d %(range)s -j ACCEPT" %
                   {'range': FLAGS.fixed_range})
-    if(FLAGS.use_ipv6):
-        _execute('sudo bash -c ' +
-                 '"echo 1 > /proc/sys/net/ipv6/conf/all/forwarding"')
-        _execute('sudo bash -c ' +
-                 '"echo 0 > /proc/sys/net/ipv6/conf/all/accept_ra"')
 
 
 def bind_floating_ip(floating_ip, check_exit_code=True):