diff options
| author | Brian Coca <bcoca@users.noreply.github.com> | 2017-08-28 17:21:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 17:21:11 -0400 |
| commit | f9b3f4f93442a8d9e2090d1d1a739741fdb9c589 (patch) | |
| tree | 0c2d77d7eee2cc86fb984dcee9639cfab06a4737 /lib/ansible/vars | |
| parent | de6ba4daff48e23bb2bee31cd075e0f6f4c8eb56 (diff) | |
| download | ansible-f9b3f4f93442a8d9e2090d1d1a739741fdb9c589.tar.gz | |
make groups magic var dependant on inventory (#28677)
* make groups magic var dependant on inventory
it was overtly restricted by 'host'
minor fixes to test_var_manager.py, need to test other values also
* pepe hates extra blank line
Diffstat (limited to 'lib/ansible/vars')
| -rw-r--r-- | lib/ansible/vars/manager.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py index 0659b825e0..854b545966 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -457,10 +457,6 @@ class VariableManager: variables['playbook_dir'] = os.path.abspath(self._loader.get_basedir()) variables['ansible_playbook_python'] = sys.executable - if host: - # host already provides some magic vars via host.get_vars() - if self._inventory: - variables['groups'] = self._inventory.get_groups_dict() if play: variables['role_names'] = [r._role_name for r in play.roles] @@ -471,6 +467,7 @@ class VariableManager: variables['role_uuid'] = text_type(task._role._uuid) if self._inventory is not None: + variables['groups'] = self._inventory.get_groups_dict() if play: templar = Templar(loader=self._loader) if templar.is_template(play.hosts): |