Commit e3e97f6e by Brian Coca

now correctly aplies add_host passed variables last to override existing vars.

parent 6dca95b3
...@@ -69,12 +69,6 @@ class ActionModule(object): ...@@ -69,12 +69,6 @@ class ActionModule(object):
inventory._hosts_cache[new_name] = new_host inventory._hosts_cache[new_name] = new_host
allgroup.add_host(new_host) allgroup.add_host(new_host)
# Add any variables to the new_host
for k in args.keys():
if not k in [ 'name', 'hostname', 'groupname', 'groups' ]:
new_host.set_variable(k, args[k])
groupnames = args.get('groupname', args.get('groups', args.get('group', ''))) groupnames = args.get('groupname', args.get('groups', args.get('group', '')))
# add it to the group if that was specified # add it to the group if that was specified
if groupnames: if groupnames:
...@@ -100,6 +94,11 @@ class ActionModule(object): ...@@ -100,6 +94,11 @@ class ActionModule(object):
# actually load host vars # actually load host vars
new_host.vars = inventory.get_host_variables(new_name, update_cached=True, vault_password=inventory._vault_password) 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():
if not k in [ 'name', 'hostname', 'groupname', 'groups' ]:
new_host.set_variable(k, args[k])
result['new_host'] = new_name result['new_host'] = new_name
# clear pattern caching completely since it's unpredictable what # clear pattern caching completely since it's unpredictable what
......
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
- name: 'A play for hosts in group: ĪīĬĭ' - name: 'A play for hosts in group: ĪīĬĭ'
hosts: 'ĪīĬĭ' hosts: 'ĪīĬĭ'
gather_facts: false
tasks:
- debug: var=hostvars[inventory_hostname]
- name: 'A play for hosts in group: ĪīĬĭ'
hosts: 'ĪīĬĭ'
gather_facts: true gather_facts: true
tasks: tasks:
- debug: msg='Unicode is a good thing ™' - debug: msg='Unicode is a good thing ™'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment