diff options
author | James Cammarata <jimi@sngx.net> | 2015-09-30 08:16:14 -0400 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2015-09-30 08:16:14 -0400 |
commit | 6fcd292c5e1126abf13322928092a997f03be383 (patch) | |
tree | b627a134170eb83c5fb5c4c84dd5a6533d0213a0 | |
parent | dc7a0b7a5b40ea1220813fc9cc04df17b6981e6e (diff) | |
parent | 50d75f8d6d5c570bfc1a13a8da6162531a2a947e (diff) | |
download | ansible-6fcd292c5e1126abf13322928092a997f03be383.tar.gz |
Merge pull request #12569 from amenonsen/fixes
Bring groups handling in ini.py up-to-date (trivial fix)
-rw-r--r-- | lib/ansible/inventory/ini.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ansible/inventory/ini.py b/lib/ansible/inventory/ini.py index d7b28fde2e..cd1a320531 100644 --- a/lib/ansible/inventory/ini.py +++ b/lib/ansible/inventory/ini.py @@ -38,15 +38,12 @@ class InventoryParser(object): with their associated hosts and variable settings. """ - def __init__(self, loader, groups=None, filename=C.DEFAULT_HOST_LIST): - if groups is None: - groups = dict() - + def __init__(self, loader, groups, filename=C.DEFAULT_HOST_LIST): self._loader = loader self.filename = filename - # Start with an empty host list and the default 'all' and - # 'ungrouped' groups. + # Start with an empty host list and whatever groups we're passed in + # (which should include the default 'all' and 'ungrouped' groups). self.hosts = {} self.patterns = {} |