summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-08-14 10:27:45 -0500
committerJames Cammarata <jimi@sngx.net>2014-08-14 15:04:23 -0500
commit293b11e45d340b56b6ff72d8c7f3701d60abf6dc (patch)
treeb50f2babb8a872f3ba184b571562a88fbb30be47
parent7a68f4e4282e181301d8adc5b7c53361defdbaba (diff)
downloadansible-293b11e45d340b56b6ff72d8c7f3701d60abf6dc.tar.gz
Fix vault_password positional args error
-rw-r--r--lib/ansible/inventory/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py
index 3999005c7a..49724c3cb7 100644
--- a/lib/ansible/inventory/__init__.py
+++ b/lib/ansible/inventory/__init__.py
@@ -142,11 +142,11 @@ class Inventory(object):
# get group vars from group_vars/ files and vars plugins
for group in self.groups:
- group.vars = utils.combine_vars(group.vars, self.get_group_variables(group.name, self._vault_password))
+ group.vars = utils.combine_vars(group.vars, self.get_group_variables(group.name, vault_password=self._vault_password))
# get host vars from host_vars/ files and vars plugins
for host in self.get_hosts():
- host.vars = utils.combine_vars(host.vars, self.get_variables(host.name, self._vault_password))
+ host.vars = utils.combine_vars(host.vars, self.get_variables(host.name, vault_password=self._vault_password))
def _match(self, str, pattern_str):