dhcp checksum fix

fuel_test/ci/ci_vm.py

@@ -2,7 +2,7 @@ from ipaddr import IPNetwork
 
 import os
 from fuel_test.ci.ci_base import CiBase
-from fuel_test.helpers import add_nmap, dhcp_checksum
+from fuel_test.helpers import add_nmap
 
 from fuel_test.node_roles import NodeRoles
 from fuel_test.settings import CONTROLLERS, COMPUTES, \
@@ -69,5 +69,4 @@ class CiVM(CiBase):
             node.await('public', timeout=600)
         master_remote = master_node.remote('public', login='root', password='r00tme')
         add_nmap(master_remote)
-        dhcp_checksum(master_remote)
         self.environment().snapshot(EMPTY_SNAPSHOT)

fuel_test/helpers.py

@@ -66,13 +66,6 @@ def install_packages2(remotes, packages):
         remote.execute(cmd)
 
 
-def dhcp_checksum(remote):
-    if OS_FAMILY == "centos" or USE_ISO:
-        remote.sudo.ssh.execute("iptables -t mangle -A POSTROUTING -p udp --dport 68 -j CHECKSUM --checksum-fill; /etc/init.d/iptables save")
-    else:
-        remote.sudo.ssh.execute("iptables -t mangle -A POSTROUTING -p udp --dport 68 -j CHECKSUM --checksum-fill; iptables-save -c > /etc/iptables.rules")
-
-
 def install_packages(remote, packages):
     if OS_FAMILY == "centos" or USE_ISO:
         remote.sudo.ssh.check_call('yum -y install %s' % packages)

iso/bootstrap_admin_node.sh

@@ -110,6 +110,8 @@ else
   puppet apply -e "class { squid: }"
 fi
 
+puppet apply -e "class { cobbler::checksum_bootpc: }"
+
 iptables -A PREROUTING -t nat -i $mgmt_if -s $mgmt_ip/$mgmt_mask ! -d $mgmt_ip -p tcp --dport 80 -j REDIRECT --to-port 3128
 
 /etc/init.d/iptables save