summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2015-03-20 11:34:18 -0400
committerBrian Coca <brian.coca+git@gmail.com>2015-03-20 11:34:53 -0400
commitbb58cbcd917e41b008bf178706565bf128a9987b (patch)
treeac86ba89732b3d3c81fe6162b909e1fc44ea2796
parent608496dbd307eb5b14776749f0f527950c325c50 (diff)
downloadansible-bb58cbcd917e41b008bf178706565bf128a9987b.tar.gz
now use combine vars to preserve existing cached host vars
-rw-r--r--lib/ansible/runner/action_plugins/add_host.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/runner/action_plugins/add_host.py b/lib/ansible/runner/action_plugins/add_host.py
index 72172fcaec..995b205b62 100644
--- a/lib/ansible/runner/action_plugins/add_host.py
+++ b/lib/ansible/runner/action_plugins/add_host.py
@@ -20,7 +20,7 @@ import ansible
from ansible.callbacks import vv
from ansible.errors import AnsibleError as ae
from ansible.runner.return_data import ReturnData
-from ansible.utils import parse_kv
+from ansible.utils import parse_kv, combine_vars
from ansible.inventory.host import Host
from ansible.inventory.group import Group
@@ -92,7 +92,7 @@ class ActionModule(object):
# actually load host vars
- new_host.vars = inventory.get_host_variables(new_name, update_cached=True, vault_password=inventory._vault_password)
+ new_host.vars = combine_vars(new_host.vars, inventory.get_host_variables(new_name, update_cached=True, vault_password=inventory._vault_password))
# Add any passed variables to the new_host
for k in args.keys():