diff options
author | Manuel Buil <mbuil@suse.com> | 2018-08-24 08:21:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-24 08:21:25 +0000 |
commit | 005fbb664c9098adc02b7e6c5b1ee601eef8e30b (patch) | |
tree | d4c61de2113fab443b5bb6edc055ed83c456bad6 /xci/playbooks | |
parent | e17c762bd13cab40a1a741ee3a9ac63db5612e4f (diff) | |
parent | 06b538de8c14a96e8b44315136bd917f16126a87 (diff) |
Merge "Modify idf to be aligned with the rest of idfs"
Diffstat (limited to 'xci/playbooks')
-rwxr-xr-x | xci/playbooks/dynamic_inventory.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xci/playbooks/dynamic_inventory.py b/xci/playbooks/dynamic_inventory.py index bf9483da..aee2a87a 100755 --- a/xci/playbooks/dynamic_inventory.py +++ b/xci/playbooks/dynamic_inventory.py @@ -93,15 +93,15 @@ class XCIInventory(object): print(e) sys.exit(1) - valid_host = (host for host in idf['xci'][self.installer]['nodes_roles'] \ + valid_host = (host for host in idf['xci']['installers'][self.installer]['nodes_roles'] \ if host in idf['xci']['flavors'][self.flavor] \ and host != 'opnfv') for host in valid_host: nodes.append(host) - hostname = idf['xci'][self.installer]['hostnames'][host] + hostname = idf['xci']['installers'][self.installer]['hostnames'][host] self.add_host(hostname) - for role in idf['xci'][self.installer]['nodes_roles'][host]: + 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] @@ -124,8 +124,8 @@ class XCIInventory(object): self.add_groupvar('all', 'host_info', host_networks) # Now add the additional groups - for parent in idf['xci'][self.installer]['groups'].keys(): - map(lambda x: self.add_group(x, parent), idf['xci'][self.installer]['groups'][parent]) + 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]) # Read additional group variables self.read_additional_group_vars() |