Merge branch 'allow-equals-in-ini-vars' of https://github.com/worklez/ansible into worklez-allow-equals-in-ini-vars

pull/6014/head
James Cammarata 11 years ago
commit 4012f4bb95

@ -119,7 +119,7 @@ class InventoryParser(object):
if t.startswith('#'):
break
try:
(k,v) = t.split("=")
(k,v) = t.split("=", 1)
except ValueError, e:
raise errors.AnsibleError("Invalid ini entry: %s - %s" % (t, str(e)))
try:

@ -55,7 +55,7 @@ class TestInventory(unittest.TestCase):
'thrudgelmir0', 'thrudgelmir1', 'thrudgelmir2',
'thrudgelmir3', 'thrudgelmir4', 'thrudgelmir5',
'Hotep-a', 'Hotep-b', 'Hotep-c',
'BastC', 'BastD', ]
'BastC', 'BastD', 'neptun', ]
#####################################
### Empty inventory format tests
@ -401,6 +401,11 @@ class TestInventory(unittest.TestCase):
'inventory_hostname_short': 'zeus',
'group_names': ['greek', 'major-god']}
def test_allows_equals_sign_in_var(self):
inventory = self.simple_inventory()
auth = inventory.get_variables('neptun')['auth']
assert auth == 'YWRtaW46YWRtaW4='
# test disabled as needs to be updated to model desired behavior
#
#def test_dir_inventory(self):

@ -17,3 +17,6 @@ loki
[egyptian]
Hotep-[a:c]
Bast[C:D]
[auth]
neptun auth="YWRtaW46YWRtaW4="

Loading…
Cancel
Save