From c53017fa23a3e495f8a091dd7e6be902fc966137 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 7 Nov 2018 16:31:08 +0000 Subject: xci: bifrost: Respect IDF DNS details during node configuration The IDF files contain DNS information so we should respect that when we configure the various XCI nodes. The DNS information is also a list instead of a string so treat it as such. Change-Id: I1c4d5eb600baaca35b2838dcafa7a75e59bf6783 Signed-off-by: Markos Chandras --- xci/playbooks/dynamic_inventory.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xci/playbooks/dynamic_inventory.py') diff --git a/xci/playbooks/dynamic_inventory.py b/xci/playbooks/dynamic_inventory.py index 7f60f94e..7831d197 100755 --- a/xci/playbooks/dynamic_inventory.py +++ b/xci/playbooks/dynamic_inventory.py @@ -47,7 +47,7 @@ class XCIInventory(object): self.opnfv_networks['opnfv']['public'] = {} self.opnfv_networks['opnfv']['public']['address'] = '192.168.122.2/24' self.opnfv_networks['opnfv']['public']['gateway'] = '192.168.122.1' - self.opnfv_networks['opnfv']['public']['dns'] = '192.168.122.1' + self.opnfv_networks['opnfv']['public']['dns'] = ['192.168.122.1'] self.opnfv_networks['opnfv']['private'] = {} self.opnfv_networks['opnfv']['private']['address'] = '172.29.240.10/22' self.opnfv_networks['opnfv']['storage'] = {} @@ -130,11 +130,13 @@ class XCIInventory(object): for network, ndata in idf['idf']['net_config'].items(): network_interface_num = idf['idf']['net_config'][network]['interface'] host_networks[hostname][network] = {} + host_networks[hostname][network]['dns'] = [] host_networks[hostname][network]['address'] = pdf_host_info['interfaces'][int(network_interface_num)]['address'] + "/" + str(ndata['mask']) if 'gateway' in ndata.keys(): host_networks[hostname][network]['gateway'] = str(ndata['gateway']) + "/" + str(ndata['mask']) if 'dns' in ndata.keys(): - host_networks[hostname][network]['dns'] = str(ndata['dns']) + for d in ndata['dns']: + host_networks[hostname][network]['dns'].append(str(d)) # Get also vlan and mac_address from pdf host_networks[hostname][network]['mac_address'] = str(pdf_host_info['interfaces'][int(network_interface_num)]['mac_address']) -- cgit 1.2.3-korg