Small changes to deploy_cluster

As Fuel 6.1 doesn't work reliable with 'virtio' NICs, changing them
to 'e1000'.
Also small cosmetic change to ifcfg generated config.

Change-Id: I2311ae945cfd957d20d14b3f2dfef19f5f4577cb

diff --git a/jenkins/build_cluster/build_cluster.py b/jenkins/build_cluster/build_cluster.py
index 7e25cd62e7a65670752cb4e9698b57cb39cbca38..6f6193c9ffe0f6b97ae6e5339080d3bac27530af 100755 (executable)
--- a/jenkins/build_cluster/build_cluster.py
+++ b/jenkins/build_cluster/build_cluster.py
@@ -331,12 +331,12 @@ def start_node(name, admin=False):
     </controller>
     <interface type='network'>
       <source network='{admin_net}'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
     <interface type='network'>
       <source network='{public_net}'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <serial type='pty'>
@@ -448,11 +448,11 @@ def inject_ifconfig_ssh():
         "BOOTPROTO=static\n" \
         "NM_CONTROLLED=no\n" \
         "IPADDR={ip}\n" \
-        "PREFIX={prefix}\n" \
+        "NETMASK={netmask}\n" \
         "GATEWAY={gw}\n" \
         .format(
             ip=str(cfg["PUBLIC_SUBNET"].ip + 2),
-            prefix=str(cfg["PUBLIC_SUBNET"].prefixlen),
+            netmask=str(cfg["PUBLIC_SUBNET"].netmask),
             gw=str(cfg["PUBLIC_SUBNET"].ip + 1)
         )
     print ("\nTo fuel:\n{0}".format(rule))