diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-08-13 15:43:34 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-08-21 15:08:36 +0000 |
| commit | 06b538de8c14a96e8b44315136bd917f16126a87 (patch) | |
| tree | e8b28af7f8b154190349a24f935a5f0c38165699 /xci/playbooks | |
| parent | 973920421d98159a3d91790859061ee718cd1e07 (diff) | |
Modify idf to be aligned with the rest of idfs
Change our idf to be more aligned with lf's idf. Adapt
dynamic_inventory.py to the change
Change-Id: Ib8f6d1684a00a8eb5ae06d5d04d308d4325cd444
Signed-off-by: Manuel Buil <mbuil@suse.com>
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() |