diff options
| author |   Justin chi <chigang@huawei.com> | 2016-11-28 14:40:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-28 14:40:18 +0000 |
| commit | 3b43081ea5434ef0819c02e9478aa135794971db (patch) | |
| tree | c58a009d69c7528c7f5038fdce685c37724206f1 | |
| parent | 1dfb4cc2940541a83afb7a46186cfda961156c5d (diff) | |
| parent | 7cb9393560159ab09aab6f5c63f812bbe8d5743e (diff) | |
Merge "FIX cobbler system edit cmd args error" into stable/colorado
| -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 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 \ |