diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:16:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:16:49 +0000 |
| commit | 48e387c5c12026a567eb7b293a3a590241c0cecb (patch) | |
| tree | 80f2573be2d7d534b8ac4d2a852fe43f7ac35324 /lib/ansible/plugins/vars | |
| parent | Releasing progress-linux version 2.16.6-1~progress7.99u1. (diff) | |
| download | ansible-core-48e387c5c12026a567eb7b293a3a590241c0cecb.tar.xz ansible-core-48e387c5c12026a567eb7b293a3a590241c0cecb.zip | |
Merging upstream version 2.17.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/ansible/plugins/vars')
| -rw-r--r-- | lib/ansible/plugins/vars/__init__.py | 3 | ||||
| -rw-r--r-- | lib/ansible/plugins/vars/host_group_vars.py | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/ansible/plugins/vars/__init__.py b/lib/ansible/plugins/vars/__init__.py index 4f9045b..12b52d9 100644 --- a/lib/ansible/plugins/vars/__init__.py +++ b/lib/ansible/plugins/vars/__init__.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see <http://www.gnu.org/licenses/>. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins import AnsiblePlugin from ansible.utils.path import basedir diff --git a/lib/ansible/plugins/vars/host_group_vars.py b/lib/ansible/plugins/vars/host_group_vars.py index 28b4213..cd02cc5 100644 --- a/lib/ansible/plugins/vars/host_group_vars.py +++ b/lib/ansible/plugins/vars/host_group_vars.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see <http://www.gnu.org/licenses/>. ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: host_group_vars @@ -74,7 +73,7 @@ class VarsModule(BaseVarsPlugin): def load_found_files(self, loader, data, found_files): for found in found_files: - new_data = loader.load_from_file(found, cache=True, unsafe=True) + new_data = loader.load_from_file(found, cache='all', unsafe=True) if new_data: # ignore empty files data = combine_vars(data, new_data) return data |