cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Error on empty group/host name (#42584)

Browse source 
* error on false host/group name
This commit is contained in:
Brian Coca 2018-07-12 09:59:00 -04:00 committed by GitHub
parent 00c88f6497
commit 12a8363fae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/inventory/data.py
View file

@ -161,6 +161,7 @@ class InventoryData(object):
def add_group(self, group):
''' adds a group to inventory if not there already '''
if group:
if group not in self.groups:
g = Group(group)
self.groups[group] = g
@ -168,6 +169,8 @@ class InventoryData(object):
display.debug("Added group %s to inventory" % group)
else:
display.debug("group %s already in inventory" % group)
else:
raise AnsibleError("Invalid empty/false group name provided: %s" % group)
def remove_group(self, group):
@ -183,6 +186,7 @@ class InventoryData(object):
def add_host(self, host, group=None, port=None):
''' adds a host to inventory and possibly a group if not there already '''
if host:
g = None
if group:
if group in self.groups:
@ -215,6 +219,8 @@ class InventoryData(object):
g.add_host(h)
self._groups_dict_cache = {}
display.debug("Added host %s to group %s" % (host, group))
else:
raise AnsibleError("Invalid empty host name provided: %s" % host)
def remove_host(self, host):