diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-10-26 11:18:12 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2016-11-10 09:01:24 +0000 |
| commit | 16e243e81874457694b0c2408d1024a7bc328fc7 (patch) | |
| tree | f6566427ae9e6fd1bf25ae56c73ce3d9021ff17e /deploy | |
| parent | 936d77c845a93a276f802948f68dd2075829da7f (diff) | |
FIX xenial baremetal deploy failure
JIRA: COMPASS-489
Change-Id: I721f22dd15279d5ef586de4eaa3735756245d47f
Signed-off-by: liyuenan <liyuenan@huawei.com>
(cherry picked from commit dde596264dadaa3e530adc4e30f9205edfaff3ba)
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/cobbler/snippets/preseed_post_install_network_config | 2 | ||||
| -rw-r--r-- | deploy/rename_nics.py | 2 |
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 cb79c556..42df3cb6 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") + #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave","static") #set $static = 1 #end if echo "auto $iname" >> /etc/network/interfaces diff --git a/deploy/rename_nics.py b/deploy/rename_nics.py index 505d6bcf..6163188e 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'" \ + 'cobbler system edit --name=%s --interface=%s --mac=%s --interface_type=static'" \ % (rsa_file, compass_ip, host_name, nic_name, mac)) exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ |