Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ansible.invetories to ansible.inventory.paths #1103

Merged
merged 3 commits into from
Mar 18, 2022
Merged

Move ansible.invetories to ansible.inventory.paths #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cddc60
Move invetories to inventory.paths
cidrblock Mar 18, 2022
4dc6cfb
Move inventory
cidrblock Mar 18, 2022
3d33909
Add comma
cidrblock Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/changelog-fragments.d/1103.breaking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Moved `ansible.inventories` to `ansible.inventory.paths` in the settings file.

-- by {user}`cidrblock`
2 changes: 1 addition & 1 deletion src/ansible_navigator/configuration_subsystem/navigator_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ class Internals:
name="inventory",
cli_parameters=CliParameters(action="append", nargs="+", short="-i"),
environment_variable_override="ansible_navigator_inventories",
settings_file_path_override="ansible.inventories",
settings_file_path_override="ansible.inventory.paths",
short_description="Specify an inventory file path or comma separated host list",
subcommands=["inventory", "run"],
value=SettingsEntryValue(),
Expand Down
11 changes: 8 additions & 3 deletions src/ansible_navigator/configuration_subsystem/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@
"additionalProperties": False,
"properties": {"path": {"type": "string"}},
},
"inventories": {
"items": {"type": "string"},
"type": "array",
"inventory": {
"additionalProperties": False,
"properties": {
"paths": {
"items": {"type": "string"},
"type": "array",
},
},
},
"playbook": {
"additionalProperties": False,
Expand Down
5 changes: 3 additions & 2 deletions tests/fixtures/unit/configuration_subsystem/ansible-navigator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ ansible-navigator:
config:
path: /tmp/ansible.cfg
cmdline: "--forks 15"
inventories:
- /tmp/test_inventory.yml
inventory:
paths:
- /tmp/test_inventory.yml
playbook:
path: /tmp/test_playbook.yml
ansible-builder:
Expand Down