diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-21 11:38:51 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-09-21 13:21:05 -0400 |
| commit | 17d5b541e93f5d88ff958372cdf0b0b184bdbc27 (patch) | |
| tree | 48d95bf35b0afd204029a2b87ab2e5c463a5fa17 /apex/inventory/inventory.py | |
| parent | 330a071566034447fa6a4de17e56be1cceb1c83b (diff) | |
Fixes removing inventory keys
Inventory keys that we want to delete were not being removed for
instackenv.json. Also fixes unit tests.
Change-Id: I7d6c752342db050d651953633f18e236f60334e3
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/inventory/inventory.py')
| -rw-r--r-- | apex/inventory/inventory.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/apex/inventory/inventory.py b/apex/inventory/inventory.py index 71f8e528..3483e577 100644 --- a/apex/inventory/inventory.py +++ b/apex/inventory/inventory.py @@ -40,7 +40,7 @@ class Inventory(dict): # move ipmi_* to pm_* # make mac a list - def munge_nodes(node): + def munge_node(node): node['pm_addr'] = node['ipmi_ip'] node['pm_password'] = node['ipmi_pass'] node['pm_user'] = node['ipmi_user'] @@ -54,23 +54,21 @@ class Inventory(dict): for i in ('ipmi_ip', 'ipmi_pass', 'ipmi_user', 'mac_address', 'disk_device'): - if i == 'disk_device' and 'disk_device' in node.keys(): - self.root_device = node[i] - else: - continue - del node[i] + if i in node.keys(): + if i == 'disk_device': + self.root_device = node[i] + del node[i] return node - - super().__init__({'nodes': list(map(munge_nodes, init_dict['nodes']))}) + super().__init__({'nodes': list(map(munge_node, init_dict['nodes']))}) # verify number of nodes - if ha and len(self['nodes']) < 5 and not virtual: + if ha and len(self['nodes']) < 5: raise InventoryException('You must provide at least 5 ' - 'nodes for HA baremetal deployment') + 'nodes for HA deployment') elif len(self['nodes']) < 2: raise InventoryException('You must provide at least 2 nodes ' - 'for non-HA baremetal deployment') + 'for non-HA deployment') if virtual: self['host-ip'] = '192.168.122.1' |