Allow hash_behaviour=merge to be respected in core inventory
(For now, this means, enable it also for inventory scripts)
This commit is contained in:
parent
7f028c101c
commit
6b1cb22fc3
1 changed files with 2 additions and 1 deletions
|
@ -16,6 +16,7 @@
|
|||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import ansible.constants as C
|
||||
from ansible import utils
|
||||
|
||||
class Host(object):
|
||||
''' a single ansible host '''
|
||||
|
@ -56,7 +57,7 @@ class Host(object):
|
|||
results = {}
|
||||
groups = self.get_groups()
|
||||
for group in sorted(groups, key=lambda g: g.depth):
|
||||
results.update(group.get_variables())
|
||||
results = utils.combine_vars(results, group.get_variables())
|
||||
results.update(self.vars)
|
||||
results['inventory_hostname'] = self.name
|
||||
results['inventory_hostname_short'] = self.name.split('.')[0]
|
||||
|
|
Loading…
Reference in a new issue