1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #330 from jhoekx/yaml-inventory-list

Yaml inventory variable list
This commit is contained in:
Michael DeHaan 2012-05-08 03:53:46 -07:00
commit 1af461f476
4 changed files with 23 additions and 8 deletions

View file

@ -54,12 +54,12 @@ class InventoryParser(object):
def _parse_base_groups(self):
undefined = Group(name='undefined')
ungrouped = Group(name='ungrouped')
all = Group(name='all')
all.add_child_group(undefined)
all.add_child_group(ungrouped)
self.groups = dict(all=all, undefined=undefined)
active_group_name = 'undefined'
self.groups = dict(all=all, ungrouped=ungrouped)
active_group_name = 'ungrouped'
for line in self.lines:
if line.startswith("["):

View file

@ -63,7 +63,12 @@ class InventoryParserYaml(object):
elif type(item) == dict and 'host' in item:
host = self._make_host(item['host'])
for (k,v) in item.get('vars',{}).items():
vars = item.get('vars', {})
if type(vars)==list:
varlist, vars = vars, {}
for subitem in varlist:
vars.update(subitem)
for (k,v) in vars.items():
host.set_variable(k,v)
elif type(item) == dict and 'group' in item:

View file

@ -221,11 +221,11 @@ class TestInventory(unittest.TestCase):
expected_hosts=['thor', 'odin', 'loki']
self.compare(hosts, expected_hosts)
def test_simple_ungrouped(self):
def test_yaml_ungrouped(self):
inventory = self.yaml_inventory()
hosts = inventory.list_hosts("ungrouped")
expected_hosts=['jupiter','zeus']
expected_hosts=['jupiter']
self.compare(hosts, expected_hosts)
def test_yaml_combined(self):
@ -258,6 +258,14 @@ class TestInventory(unittest.TestCase):
'hammer':True,
'inventory_hostname': 'thor'}
def test_yaml_list_vars(self):
inventory = self.yaml_inventory()
vars = inventory.get_variables('zeus')
assert vars == {'ansible_ssh_port': 3001,
'group_names': ['greek', 'ruler'],
'inventory_hostname': 'zeus',
'ntp_server': 'olympus.example.com'}
def test_yaml_change_vars(self):
inventory = self.yaml_inventory()
vars = inventory.get_variables('thor')

View file

@ -6,7 +6,9 @@
moon: titan
moon2: enceladus
- zeus
- host: zeus
vars:
- ansible_ssh_port: 3001
- group: greek
hosts: