diff options
| author | Rene Moser <mail@renemoser.net> | 2017-09-06 20:04:17 +0200 |
|---|---|---|
| committer | Brian Coca <bcoca@users.noreply.github.com> | 2017-09-07 00:09:07 -0400 |
| commit | da488a8db5c035634df111d54933dcca962b5636 (patch) | |
| tree | d7c5d0500b07c026ca62db8aa1aad53023220aed /lib/ansible | |
| parent | f4fff54f6804885f5b203406a614d07b331cc646 (diff) | |
| download | ansible-da488a8db5c035634df111d54933dcca962b5636.tar.gz | |
config: use path list for default inventory
This allows to use a pathlist in the ansible.cfg:
[default]
inventory = path/inventory:other_path/inventory
Since ansible allows to use --inventory on CLI more then once, we should also support a pathlist in the config.
Diffstat (limited to 'lib/ansible')
| -rw-r--r-- | lib/ansible/cli/__init__.py | 4 | ||||
| -rw-r--r-- | lib/ansible/config/base.yml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index 07bf7a6911..6d0292dba1 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -596,9 +596,7 @@ class CLI(with_metaclass(ABCMeta, object)): self.options.inventory = [unfrackpath(opt) if ',' not in opt else opt for opt in self.options.inventory] else: - # set default if it exists - if os.path.exists(C.DEFAULT_HOST_LIST): - self.options.inventory = [C.DEFAULT_HOST_LIST] + self.options.inventory = C.DEFAULT_HOST_LIST @staticmethod def version(prog): diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 4ba8c460df..e18f101633 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -604,7 +604,7 @@ DEFAULT_HOST_LIST: expand_relative_paths: True ini: - {key: inventory, section: defaults} - type: path + type: pathlist yaml: {key: defaults.inventory} DEFAULT_INTERNAL_POLL_INTERVAL: default: 0.001 |