From 28f7ee6482e4f104108c11518ccf9526e1b61c58 Mon Sep 17 00:00:00 2001 From: 00184532 Date: Mon, 11 Dec 2017 13:58:48 +0800 Subject: [PATCH] config ip to dataplane after install os Change-Id: Ib5f51fd23e50f776b084321b3992f4ea6dbe8659 --- backend/kolla/daisy.py | 2 -- code/daisy/daisy/api/backends/osinstall/pxe/install.py | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/kolla/daisy.py b/backend/kolla/daisy.py index b5e1aa9e..c1100306 100755 --- a/backend/kolla/daisy.py +++ b/backend/kolla/daisy.py @@ -266,8 +266,6 @@ def multi_plane(interface): def plane_overlapping_check(interface): plane_num = len(interface['assigned_networks']) - if interface.get('vswitch_type', None) == 'dvs': - return if plane_num == 0 and not update_network_mode: print "%s %s is not belong to any physnet planes" % (datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S:%f"), interface['name']) diff --git a/code/daisy/daisy/api/backends/osinstall/pxe/install.py b/code/daisy/daisy/api/backends/osinstall/pxe/install.py index 4ce60723..c8de5bde 100755 --- a/code/daisy/daisy/api/backends/osinstall/pxe/install.py +++ b/code/daisy/daisy/api/backends/osinstall/pxe/install.py @@ -476,7 +476,15 @@ def _get_host_interfaces(host_info): # remove duplicates assigned networks if assigned_network.get('ip') not in no_dup_networks.keys() \ or assigned_network.get('network_type') == 'MANAGEMENT': - no_dup_networks[assigned_network['ip']] = assigned_network + # when diff network assigned to same interface,we just use + # first assign network to call daisy.py to config env network. + # If in some case we get external instead of dataplane, + # it will not config ip to interrface according to daisy.py. + if assigned_network.get('network_type') == 'EXTERNAL' and \ + len(interface['assigned_networks']) > 1: + continue + else: + no_dup_networks[assigned_network['ip']] = assigned_network if no_dup_networks: interface['assigned_networks'] = no_dup_networks.values() return interfaces