summaryrefslogtreecommitdiffstats
path: root/xci/playbooks/dynamic_inventory.py
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2019-08-22 09:50:31 +0200
committerManuel Buil <mbuil@suse.com>2019-08-22 19:13:38 +0200
commit635f6b0468110b437740e8cbbe7a8dbc7947397b (patch)
treee8b8763ce8f155f1c5d96ab70e11014222f70f85 /xci/playbooks/dynamic_inventory.py
parent6f177f316999170ec7e1c85605bf48560282edd5 (diff)
Support for py3
This patch provides support for py3 in the deployment host and the OPNFV VM. Some extra changes will need to happen in the future when distros disclose how they will react to the py2 expiration. * virtualbmc version is upgraded to 1.5 because 1.3 is not compatible with py3 * The dynamic inventory is slightly modified because it was using functionality that changes in py3 * pip3 check is removed as Ansible now works with py3 deploy-scenario:k8-calico-nofeature installer-type:osh Change-Id: I34178ebc357b0a299c0017d6f9e596b815c77b3b Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'xci/playbooks/dynamic_inventory.py')
-rwxr-xr-xxci/playbooks/dynamic_inventory.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/xci/playbooks/dynamic_inventory.py b/xci/playbooks/dynamic_inventory.py
index 0ea35ff7..ed63141c 100755
--- a/xci/playbooks/dynamic_inventory.py
+++ b/xci/playbooks/dynamic_inventory.py
@@ -127,8 +127,8 @@ class XCIInventory(object):
for role in idf['xci']['installers'][self.installer]['nodes_roles'][host]:
self.add_to_group(role, hostname)
- pdf_host_info = filter(lambda x: x['name'] == host, pdf['nodes'])[0]
- native_vlan_if = filter(lambda x: x['vlan'] == 'native', pdf_host_info['interfaces'])
+ pdf_host_info = list(filter(lambda x: x['name'] == host, pdf['nodes']))[0]
+ native_vlan_if = list(filter(lambda x: x['vlan'] == 'native', pdf_host_info['interfaces']))
self.add_hostvar(hostname, 'ansible_host', native_vlan_if[0]['address'])
self.add_hostvar(hostname, 'ip', native_vlan_if[0]['address'])
host_networks[hostname] = {}
@@ -173,7 +173,8 @@ class XCIInventory(object):
# Now add the additional groups
for parent in idf['xci']['installers'][self.installer]['groups'].keys():
- map(lambda x: self.add_group(x, parent), idf['xci']['installers'][self.installer]['groups'][parent])
+ for host in idf['xci']['installers'][self.installer]['groups'][parent]:
+ self.add_group(host, parent)
# Read additional group variables
self.read_additional_group_vars()