FIX cobbler system edit cmd args error

use "--static=1" to set server nic to static mode

JIRA: COMPASS-489

Change-Id: I4d8d90f861b6b264575fc0781f585a6ef6bd1c70
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
index 42df3cb..cb79c55 100644 (file)
--- a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
+++ b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
@@ -441,7 +441,7 @@ echo "" >> /etc/network/interfaces
 
 used_logical_interface_$iname=$iname
 
-    #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave","static")
+    #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave")
         #set $static = 1
     #end if
 echo "auto $iname" >> /etc/network/interfaces

diff --git a/deploy/rename_nics.py b/deploy/rename_nics.py
index a460e80..21651f6 100644 (file)
--- a/deploy/rename_nics.py
+++ b/deploy/rename_nics.py
@@ -17,16 +17,10 @@ def rename_nics(dha_info, rsa_file, compass_ip, os_version):
                 nic_name = interface.keys()[0]
                 mac = interface.values()[0]
 
-                if os_version == 'xenial':
-                    exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-                              -i %s root@%s \
-                              'cobbler system edit --name=%s --interface=%s --mac=%s --interface_type=static'"   # noqa
-                             % (rsa_file, compass_ip, host_name, nic_name, mac))   # noqa
-                else:
-                    exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-                              -i %s root@%s \
-                              'cobbler system edit --name=%s --interface=%s --mac=%s'"   # noqa
-                             % (rsa_file, compass_ip, host_name, nic_name, mac))  # noqa
+                exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+                          -i %s root@%s \
+                          'cobbler system edit --name=%s --interface=%s --mac=%s --static=1'"   # noqa
+                         % (rsa_file, compass_ip, host_name, nic_name, mac))   # noqa
 
     exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
               -i %s root@%s \