From 7cddc603fcc73b0519ebde696161ec7aa67deeec Mon Sep 17 00:00:00 2001 From: cidrblock Date: Fri, 18 Mar 2022 04:36:29 -0700 Subject: [PATCH 1/3] Move invetories to inventory.paths --- .../navigator_configuration.py | 2 +- .../configuration_subsystem/schema.py | 11 ++++++++--- .../configuration_subsystem/ansible-navigator.yml | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ansible_navigator/configuration_subsystem/navigator_configuration.py b/src/ansible_navigator/configuration_subsystem/navigator_configuration.py index 531fcaba2..62a3385cf 100644 --- a/src/ansible_navigator/configuration_subsystem/navigator_configuration.py +++ b/src/ansible_navigator/configuration_subsystem/navigator_configuration.py @@ -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(), diff --git a/src/ansible_navigator/configuration_subsystem/schema.py b/src/ansible_navigator/configuration_subsystem/schema.py index e81ee7a4a..7749bafe4 100644 --- a/src/ansible_navigator/configuration_subsystem/schema.py +++ b/src/ansible_navigator/configuration_subsystem/schema.py @@ -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, diff --git a/tests/fixtures/unit/configuration_subsystem/ansible-navigator.yml b/tests/fixtures/unit/configuration_subsystem/ansible-navigator.yml index 3ed0df5f2..69dc87df7 100644 --- a/tests/fixtures/unit/configuration_subsystem/ansible-navigator.yml +++ b/tests/fixtures/unit/configuration_subsystem/ansible-navigator.yml @@ -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: From 4dc6cfbb55ce3442dfaacfb7a8e8260676d96594 Mon Sep 17 00:00:00 2001 From: cidrblock Date: Fri, 18 Mar 2022 04:39:45 -0700 Subject: [PATCH 2/3] Move inventory --- docs/changelog-fragments.d/1103.breaking.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/changelog-fragments.d/1103.breaking.md diff --git a/docs/changelog-fragments.d/1103.breaking.md b/docs/changelog-fragments.d/1103.breaking.md new file mode 100644 index 000000000..9fa0919c1 --- /dev/null +++ b/docs/changelog-fragments.d/1103.breaking.md @@ -0,0 +1,3 @@ +Moved `ansible.inventories` to `ansible.inventory.paths` in the settings file. + +-- by {user}`cidrblock` From 3d339096921bfd66f18be1379987e4fb0a7a53e1 Mon Sep 17 00:00:00 2001 From: cidrblock Date: Fri, 18 Mar 2022 05:08:10 -0700 Subject: [PATCH 3/3] Add comma --- src/ansible_navigator/configuration_subsystem/schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansible_navigator/configuration_subsystem/schema.py b/src/ansible_navigator/configuration_subsystem/schema.py index 7749bafe4..5b7462241 100644 --- a/src/ansible_navigator/configuration_subsystem/schema.py +++ b/src/ansible_navigator/configuration_subsystem/schema.py @@ -24,7 +24,7 @@ "paths": { "items": {"type": "string"}, "type": "array", - } + }, }, }, "playbook": {