From 59b0e20b6c1f7f80ce7dcacfa8fb5e1687eefeea Mon Sep 17 00:00:00 2001 From: chenshuai Date: Mon, 31 Oct 2016 03:17:44 -0400 Subject: code refactoring: opendaylight JIRA: COMPASS-500 Change-Id: I205f1fb1f31219517f6e2408fa43c8679a1cc0a6 Signed-off-by: chenshuai Signed-off-by: chenshuai@huawei.com --- deploy/rename_nics.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'deploy/rename_nics.py') diff --git a/deploy/rename_nics.py b/deploy/rename_nics.py index 6163188e..dcec51df 100644 --- a/deploy/rename_nics.py +++ b/deploy/rename_nics.py @@ -6,7 +6,7 @@ def exec_cmd(cmd): print cmd os.system(cmd) -def rename_nics(dha_info, rsa_file, compass_ip): +def rename_nics(dha_info, rsa_file, compass_ip, os_version): for host in dha_info['hosts']: host_name = host['name'] interfaces = host.get('interfaces') @@ -15,15 +15,21 @@ def rename_nics(dha_info, rsa_file, compass_ip): nic_name = interface.keys()[0] mac = interface.values()[0] - 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'" \ - % (rsa_file, compass_ip, host_name, nic_name, mac)) + 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'" \ + % (rsa_file, compass_ip, host_name, nic_name, mac)) + else: + exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + -i %s root@%s \ + 'cobbler system edit --name=%s --interface=%s --mac=%s'" \ + % (rsa_file, compass_ip, host_name, nic_name, mac)) exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ -i %s root@%s \ 'cobbler sync'" % (rsa_file, compass_ip)) if __name__ == "__main__": - assert(len(sys.argv) == 4) - rename_nics(yaml.load(open(sys.argv[1])), sys.argv[2], sys.argv[3]) + assert(len(sys.argv) == 5) + rename_nics(yaml.load(open(sys.argv[1])), sys.argv[2], sys.argv[3], sys.argv[4]) -- cgit 1.2.3-korg