diff options
| author | Matt Clay <matt@mystile.com> | 2019-08-21 12:12:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 12:12:37 -0700 |
| commit | 29ac0273d4f421a0919c1e7d7608b2d7fd7a35b4 (patch) | |
| tree | 43e2e6eb3e6b93598a4ad4e19fa4b34c886eec09 /test/lib/ansible_test/_internal/ansible_util.py | |
| parent | 20ced48717764aa9b15d19922ac4efcfb1a0e235 (diff) | |
| download | ansible-29ac0273d4f421a0919c1e7d7608b2d7fd7a35b4.tar.gz | |
Update ansible-test collection inventory handling. (#61031)
* Update ansible-test collection inventory handling.
- The `windows-integration` command now supports the `--inventory` option.
- The incomplete support for host_vars and group_vars directories has been removed.
- The incomplete support for an inventory directory has been removed.
- The inventory specified by `--inventory` can now reside outside the install and content roots.
- Using `ansible_ssh_private_key_file` with `--docker` or `--remote` results in a warning about the combination being unsupported and likely to fail.
* Fix config handling.
* Fix payload handling of ssh keys.
* Disable pylint no-self-use rule for ansible-test.
* De-duplicate payload paths.
Diffstat (limited to 'test/lib/ansible_test/_internal/ansible_util.py')
| -rw-r--r-- | test/lib/ansible_test/_internal/ansible_util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/ansible_test/_internal/ansible_util.py b/test/lib/ansible_test/_internal/ansible_util.py index 7b4c1e5470..f3f3323a02 100644 --- a/test/lib/ansible_test/_internal/ansible_util.py +++ b/test/lib/ansible_test/_internal/ansible_util.py @@ -26,6 +26,7 @@ from .util_common import ( from .config import ( PosixIntegrationConfig, EnvironmentConfig, + CommonConfig, ) from .data import ( @@ -50,7 +51,7 @@ def ansible_environment(args, color=True, ansible_config=None): if not ansible_config: # use the default empty configuration unless one has been provided - ansible_config = os.path.join(ANSIBLE_TEST_DATA_ROOT, 'ansible.cfg') + ansible_config = args.get_ansible_config() if not args.explain and not os.path.exists(ansible_config): raise ApplicationError('Configuration not found: %s' % ansible_config) |