aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-11-28 16:14:35 +0800
committerQiLiang <liangqi1@huawei.com>2016-11-28 16:14:35 +0800
commit7cb9393560159ab09aab6f5c63f812bbe8d5743e (patch)
treeafc5f96a8904603cdefa5c4d9a66b15312cc4d29
parentb212b7ac454fea642d7637e7489ff69665e54289 (diff)
FIX cobbler system edit cmd args error
use "--static=1" to set server nic to static mode JIRA: COMPASS-489 Change-Id: I18df24505a8cf5587670c86df1275b34bfb0837a Signed-off-by: QiLiang <liangqi1@huawei.com>
-rw-r--r--deploy/adapters/cobbler/snippets/preseed_post_install_network_config2
-rw-r--r--deploy/rename_nics.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
index 42df3cb6..cb79c556 100644
--- 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 6163188e..a95d1e02 100644
--- a/deploy/rename_nics.py
+++ b/deploy/rename_nics.py
@@ -17,7 +17,7 @@ def rename_nics(dha_info, rsa_file, compass_ip):
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'" \
+ 'cobbler system edit --name=%s --interface=%s --mac=%s --static=1'" \
% (rsa_file, compass_ip, host_name, nic_name, mac))
exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \