Flatten the directory hierarchy of modules (#68966)

* Flatten the directory hierarchy of modules

* Update ignore.txt, flatten units

* Update imports

* Completely flatten the modules directory

* Update sanity ignore

* Fix some sanity test ignores

* Fix relative import

* Fix docs builds without category

* ci_complete

* Clean up docs. ci_complete

* Adjust needs/file alias

* ci_complete

* fix hardcoded ping module paths

Co-authored-by: Matt Davis <mrd@redhat.com>

82 files changed, 1 insertions, 1 deletions

diff --git a/lib/ansible/modules/inventory/add_host.py b/lib/ansible/modules/add_host.py
index 5b125ad3cb..5b125ad3cb 100644
--- a/lib/ansible/modules/inventory/add_host.py
+++ b/lib/ansible/modules/add_host.py
diff --git a/lib/ansible/modules/packaging/os/apt.py b/lib/ansible/modules/apt.py
index 1fc5a34d20..1fc5a34d20 100644
--- a/lib/ansible/modules/packaging/os/apt.py
+++ b/lib/ansible/modules/apt.py
diff --git a/lib/ansible/modules/packaging/os/apt_key.py b/lib/ansible/modules/apt_key.py
index 425193a5a5..425193a5a5 100644
--- a/lib/ansible/modules/packaging/os/apt_key.py
+++ b/lib/ansible/modules/apt_key.py
diff --git a/lib/ansible/modules/packaging/os/apt_repository.py b/lib/ansible/modules/apt_repository.py
index f94cf6ad35..f94cf6ad35 100644
--- a/lib/ansible/modules/packaging/os/apt_repository.py
+++ b/lib/ansible/modules/apt_repository.py
diff --git a/lib/ansible/modules/files/assemble.py b/lib/ansible/modules/assemble.py
index 57ece419f9..57ece419f9 100644
--- a/lib/ansible/modules/files/assemble.py
+++ b/lib/ansible/modules/assemble.py
diff --git a/lib/ansible/modules/utilities/logic/assert.py b/lib/ansible/modules/assert.py
index cf66d5264c..cf66d5264c 100644
--- a/lib/ansible/modules/utilities/logic/assert.py
+++ b/lib/ansible/modules/assert.py
diff --git a/lib/ansible/modules/utilities/logic/async_status.py b/lib/ansible/modules/async_status.py
index db42869957..db42869957 100644
--- a/lib/ansible/modules/utilities/logic/async_status.py
+++ b/lib/ansible/modules/async_status.py
diff --git a/lib/ansible/modules/utilities/logic/async_wrapper.py b/lib/ansible/modules/async_wrapper.py
index 26f0ef08b5..26f0ef08b5 100644
--- a/lib/ansible/modules/utilities/logic/async_wrapper.py
+++ b/lib/ansible/modules/async_wrapper.py
diff --git a/lib/ansible/modules/files/blockinfile.py b/lib/ansible/modules/blockinfile.py
index 2db20fe5f7..2db20fe5f7 100644
--- a/lib/ansible/modules/files/blockinfile.py
+++ b/lib/ansible/modules/blockinfile.py
diff --git a/lib/ansible/modules/commands/command.py b/lib/ansible/modules/command.py
index 6aa4391e5e..6aa4391e5e 100644
--- a/lib/ansible/modules/commands/command.py
+++ b/lib/ansible/modules/command.py
diff --git a/lib/ansible/modules/commands/__init__.py b/lib/ansible/modules/commands/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/commands/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/files/copy.py b/lib/ansible/modules/copy.py
index 0c15016bc8..0c15016bc8 100644
--- a/lib/ansible/modules/files/copy.py
+++ b/lib/ansible/modules/copy.py
diff --git a/lib/ansible/modules/system/cron.py b/lib/ansible/modules/cron.py
index 4b4f421c5e..4b4f421c5e 100644
--- a/lib/ansible/modules/system/cron.py
+++ b/lib/ansible/modules/cron.py
diff --git a/lib/ansible/modules/system/debconf.py b/lib/ansible/modules/debconf.py
index 3466e0a92c..3466e0a92c 100644
--- a/lib/ansible/modules/system/debconf.py
+++ b/lib/ansible/modules/debconf.py
diff --git a/lib/ansible/modules/utilities/logic/debug.py b/lib/ansible/modules/debug.py
index 8a3f0caa52..8a3f0caa52 100644
--- a/lib/ansible/modules/utilities/logic/debug.py
+++ b/lib/ansible/modules/debug.py
diff --git a/lib/ansible/modules/packaging/os/dnf.py b/lib/ansible/modules/dnf.py
index a8625ed3d4..a8625ed3d4 100644
--- a/lib/ansible/modules/packaging/os/dnf.py
+++ b/lib/ansible/modules/dnf.py
diff --git a/lib/ansible/modules/packaging/os/dpkg_selections.py b/lib/ansible/modules/dpkg_selections.py
index ccfb89226d..ccfb89226d 100644
--- a/lib/ansible/modules/packaging/os/dpkg_selections.py
+++ b/lib/ansible/modules/dpkg_selections.py
diff --git a/lib/ansible/modules/commands/expect.py b/lib/ansible/modules/expect.py
index 6a0d6b7749..6a0d6b7749 100644
--- a/lib/ansible/modules/commands/expect.py
+++ b/lib/ansible/modules/expect.py
diff --git a/lib/ansible/modules/utilities/logic/fail.py b/lib/ansible/modules/fail.py
index 2a10bdadf7..2a10bdadf7 100644
--- a/lib/ansible/modules/utilities/logic/fail.py
+++ b/lib/ansible/modules/fail.py
diff --git a/lib/ansible/modules/files/fetch.py b/lib/ansible/modules/fetch.py
index d87ec1274f..d87ec1274f 100644
--- a/lib/ansible/modules/files/fetch.py
+++ b/lib/ansible/modules/fetch.py
diff --git a/lib/ansible/modules/files/file.py b/lib/ansible/modules/file.py
index bd313baf9e..bd313baf9e 100644
--- a/lib/ansible/modules/files/file.py
+++ b/lib/ansible/modules/file.py
diff --git a/lib/ansible/modules/files/__init__.py b/lib/ansible/modules/files/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/files/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/files/find.py b/lib/ansible/modules/find.py
index ad8c5ea38e..ad8c5ea38e 100644
--- a/lib/ansible/modules/files/find.py
+++ b/lib/ansible/modules/find.py
diff --git a/lib/ansible/modules/system/gather_facts.py b/lib/ansible/modules/gather_facts.py
index 711c840a98..711c840a98 100644
--- a/lib/ansible/modules/system/gather_facts.py
+++ b/lib/ansible/modules/gather_facts.py
diff --git a/lib/ansible/modules/net_tools/basics/get_url.py b/lib/ansible/modules/get_url.py
index ea033d9cfe..ea033d9cfe 100644
--- a/lib/ansible/modules/net_tools/basics/get_url.py
+++ b/lib/ansible/modules/get_url.py
diff --git a/lib/ansible/modules/system/getent.py b/lib/ansible/modules/getent.py
index ae4a901a8b..ae4a901a8b 100644
--- a/lib/ansible/modules/system/getent.py
+++ b/lib/ansible/modules/getent.py
diff --git a/lib/ansible/modules/source_control/git.py b/lib/ansible/modules/git.py
index bff6918432..bff6918432 100644
--- a/lib/ansible/modules/source_control/git.py
+++ b/lib/ansible/modules/git.py
diff --git a/lib/ansible/modules/system/group.py b/lib/ansible/modules/group.py
index 4c6d0b99a3..4c6d0b99a3 100644
--- a/lib/ansible/modules/system/group.py
+++ b/lib/ansible/modules/group.py
diff --git a/lib/ansible/modules/inventory/group_by.py b/lib/ansible/modules/group_by.py
index 8572d606fd..8572d606fd 100644
--- a/lib/ansible/modules/inventory/group_by.py
+++ b/lib/ansible/modules/group_by.py
diff --git a/lib/ansible/modules/system/hostname.py b/lib/ansible/modules/hostname.py
index e9def3b038..e9def3b038 100644
--- a/lib/ansible/modules/system/hostname.py
+++ b/lib/ansible/modules/hostname.py
diff --git a/lib/ansible/modules/utilities/logic/import_playbook.py b/lib/ansible/modules/import_playbook.py
index 17ce2c9161..17ce2c9161 100644
--- a/lib/ansible/modules/utilities/logic/import_playbook.py
+++ b/lib/ansible/modules/import_playbook.py
diff --git a/lib/ansible/modules/utilities/logic/import_role.py b/lib/ansible/modules/import_role.py
index baca26f20b..baca26f20b 100644
--- a/lib/ansible/modules/utilities/logic/import_role.py
+++ b/lib/ansible/modules/import_role.py
diff --git a/lib/ansible/modules/utilities/logic/import_tasks.py b/lib/ansible/modules/import_tasks.py
index 3d54a7c549..3d54a7c549 100644
--- a/lib/ansible/modules/utilities/logic/import_tasks.py
+++ b/lib/ansible/modules/import_tasks.py
diff --git a/lib/ansible/modules/utilities/logic/include.py b/lib/ansible/modules/include.py
index cde31150fe..cde31150fe 100644
--- a/lib/ansible/modules/utilities/logic/include.py
+++ b/lib/ansible/modules/include.py
diff --git a/lib/ansible/modules/utilities/logic/include_role.py b/lib/ansible/modules/include_role.py
index 722251cb8e..722251cb8e 100644
--- a/lib/ansible/modules/utilities/logic/include_role.py
+++ b/lib/ansible/modules/include_role.py
diff --git a/lib/ansible/modules/utilities/logic/include_tasks.py b/lib/ansible/modules/include_tasks.py
index f55351b399..f55351b399 100644
--- a/lib/ansible/modules/utilities/logic/include_tasks.py
+++ b/lib/ansible/modules/include_tasks.py
diff --git a/lib/ansible/modules/utilities/logic/include_vars.py b/lib/ansible/modules/include_vars.py
index 58d1f00bf2..58d1f00bf2 100644
--- a/lib/ansible/modules/utilities/logic/include_vars.py
+++ b/lib/ansible/modules/include_vars.py
diff --git a/lib/ansible/modules/inventory/__init__.py b/lib/ansible/modules/inventory/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/inventory/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/system/iptables.py b/lib/ansible/modules/iptables.py
index 8e4e6b134f..8e4e6b134f 100644
--- a/lib/ansible/modules/system/iptables.py
+++ b/lib/ansible/modules/iptables.py
diff --git a/lib/ansible/modules/system/known_hosts.py b/lib/ansible/modules/known_hosts.py
index 5349f9f803..5349f9f803 100644
--- a/lib/ansible/modules/system/known_hosts.py
+++ b/lib/ansible/modules/known_hosts.py
diff --git a/lib/ansible/modules/files/lineinfile.py b/lib/ansible/modules/lineinfile.py
index d3094bede3..d3094bede3 100644
--- a/lib/ansible/modules/files/lineinfile.py
+++ b/lib/ansible/modules/lineinfile.py
diff --git a/lib/ansible/modules/utilities/helper/meta.py b/lib/ansible/modules/meta.py
index 2d683f0217..2d683f0217 100644
--- a/lib/ansible/modules/utilities/helper/meta.py
+++ b/lib/ansible/modules/meta.py
diff --git a/lib/ansible/modules/net_tools/__init__.py b/lib/ansible/modules/net_tools/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/net_tools/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/net_tools/basics/__init__.py b/lib/ansible/modules/net_tools/basics/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/net_tools/basics/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/packaging/os/package.py b/lib/ansible/modules/package.py
index b48a5dcf07..b48a5dcf07 100644
--- a/lib/ansible/modules/packaging/os/package.py
+++ b/lib/ansible/modules/package.py
diff --git a/lib/ansible/modules/packaging/os/package_facts.py b/lib/ansible/modules/package_facts.py
index b00db2fe2c..b00db2fe2c 100644
--- a/lib/ansible/modules/packaging/os/package_facts.py
+++ b/lib/ansible/modules/package_facts.py
diff --git a/lib/ansible/modules/packaging/__init__.py b/lib/ansible/modules/packaging/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/packaging/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/packaging/language/__init__.py b/lib/ansible/modules/packaging/language/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/packaging/language/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/packaging/os/__init__.py b/lib/ansible/modules/packaging/os/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/packaging/os/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/utilities/logic/pause.py b/lib/ansible/modules/pause.py
index 9fd8db5e0e..9fd8db5e0e 100644
--- a/lib/ansible/modules/utilities/logic/pause.py
+++ b/lib/ansible/modules/pause.py
diff --git a/lib/ansible/modules/system/ping.py b/lib/ansible/modules/ping.py
index 4cf384b35f..4cf384b35f 100644
--- a/lib/ansible/modules/system/ping.py
+++ b/lib/ansible/modules/ping.py
diff --git a/lib/ansible/modules/packaging/language/pip.py b/lib/ansible/modules/pip.py
index 9ce74e6b09..9ce74e6b09 100644
--- a/lib/ansible/modules/packaging/language/pip.py
+++ b/lib/ansible/modules/pip.py
diff --git a/lib/ansible/modules/commands/raw.py b/lib/ansible/modules/raw.py
index 928350dbc6..928350dbc6 100644
--- a/lib/ansible/modules/commands/raw.py
+++ b/lib/ansible/modules/raw.py
diff --git a/lib/ansible/modules/system/reboot.py b/lib/ansible/modules/reboot.py
index 0fab23a609..0fab23a609 100644
--- a/lib/ansible/modules/system/reboot.py
+++ b/lib/ansible/modules/reboot.py
diff --git a/lib/ansible/modules/files/replace.py b/lib/ansible/modules/replace.py
index d10da8049e..d10da8049e 100644
--- a/lib/ansible/modules/files/replace.py
+++ b/lib/ansible/modules/replace.py
diff --git a/lib/ansible/modules/packaging/os/rpm_key.py b/lib/ansible/modules/rpm_key.py
index f64992e944..f64992e944 100644
--- a/lib/ansible/modules/packaging/os/rpm_key.py
+++ b/lib/ansible/modules/rpm_key.py
diff --git a/lib/ansible/modules/commands/script.py b/lib/ansible/modules/script.py
index ed66947c4b..ed66947c4b 100644
--- a/lib/ansible/modules/commands/script.py
+++ b/lib/ansible/modules/script.py
diff --git a/lib/ansible/modules/system/service.py b/lib/ansible/modules/service.py
index 8846a36c65..8846a36c65 100644
--- a/lib/ansible/modules/system/service.py
+++ b/lib/ansible/modules/service.py
diff --git a/lib/ansible/modules/system/service_facts.py b/lib/ansible/modules/service_facts.py
index 5f8b4d52d9..5f8b4d52d9 100644
--- a/lib/ansible/modules/system/service_facts.py
+++ b/lib/ansible/modules/service_facts.py
diff --git a/lib/ansible/modules/utilities/logic/set_fact.py b/lib/ansible/modules/set_fact.py
index 5ee512cbd9..5ee512cbd9 100644
--- a/lib/ansible/modules/utilities/logic/set_fact.py
+++ b/lib/ansible/modules/set_fact.py
diff --git a/lib/ansible/modules/utilities/logic/set_stats.py b/lib/ansible/modules/set_stats.py
index d35160b38b..d35160b38b 100644
--- a/lib/ansible/modules/utilities/logic/set_stats.py
+++ b/lib/ansible/modules/set_stats.py
diff --git a/lib/ansible/modules/system/setup.py b/lib/ansible/modules/setup.py
index ccf40faa8e..70756568be 100644
--- a/lib/ansible/modules/system/setup.py
+++ b/lib/ansible/modules/setup.py
@@ -133,7 +133,7 @@ EXAMPLES = """
 """
 
 # import module snippets
-from ...module_utils.basic import AnsibleModule
+from ..module_utils.basic import AnsibleModule
 
 from ansible.module_utils.facts.namespace import PrefixFactNamespace
 from ansible.module_utils.facts import ansible_collector
diff --git a/lib/ansible/modules/commands/shell.py b/lib/ansible/modules/shell.py
index 4dc4411a67..4dc4411a67 100644
--- a/lib/ansible/modules/commands/shell.py
+++ b/lib/ansible/modules/shell.py
diff --git a/lib/ansible/modules/net_tools/basics/slurp.py b/lib/ansible/modules/slurp.py
index c1891eac04..c1891eac04 100644
--- a/lib/ansible/modules/net_tools/basics/slurp.py
+++ b/lib/ansible/modules/slurp.py
diff --git a/lib/ansible/modules/source_control/__init__.py b/lib/ansible/modules/source_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/source_control/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/files/stat.py b/lib/ansible/modules/stat.py
index 31bd132699..31bd132699 100644
--- a/lib/ansible/modules/files/stat.py
+++ b/lib/ansible/modules/stat.py
diff --git a/lib/ansible/modules/source_control/subversion.py b/lib/ansible/modules/subversion.py
index 1e60529a06..1e60529a06 100644
--- a/lib/ansible/modules/source_control/subversion.py
+++ b/lib/ansible/modules/subversion.py
diff --git a/lib/ansible/modules/system/__init__.py b/lib/ansible/modules/system/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/system/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/system/systemd.py b/lib/ansible/modules/systemd.py
index eaae69b7f2..eaae69b7f2 100644
--- a/lib/ansible/modules/system/systemd.py
+++ b/lib/ansible/modules/systemd.py
diff --git a/lib/ansible/modules/system/sysvinit.py b/lib/ansible/modules/sysvinit.py
index ecd0e8c2f8..ecd0e8c2f8 100644
--- a/lib/ansible/modules/system/sysvinit.py
+++ b/lib/ansible/modules/sysvinit.py
diff --git a/lib/ansible/modules/files/tempfile.py b/lib/ansible/modules/tempfile.py
index 17d459aa29..17d459aa29 100644
--- a/lib/ansible/modules/files/tempfile.py
+++ b/lib/ansible/modules/tempfile.py
diff --git a/lib/ansible/modules/files/template.py b/lib/ansible/modules/template.py
index c24deb72af..c24deb72af 100644
--- a/lib/ansible/modules/files/template.py
+++ b/lib/ansible/modules/template.py
diff --git a/lib/ansible/modules/files/unarchive.py b/lib/ansible/modules/unarchive.py
index 58680d811f..58680d811f 100644
--- a/lib/ansible/modules/files/unarchive.py
+++ b/lib/ansible/modules/unarchive.py
diff --git a/lib/ansible/modules/net_tools/basics/uri.py b/lib/ansible/modules/uri.py
index 9110301146..9110301146 100644
--- a/lib/ansible/modules/net_tools/basics/uri.py
+++ b/lib/ansible/modules/uri.py
diff --git a/lib/ansible/modules/system/user.py b/lib/ansible/modules/user.py
index 254e07f552..254e07f552 100644
--- a/lib/ansible/modules/system/user.py
+++ b/lib/ansible/modules/user.py
diff --git a/lib/ansible/modules/utilities/__init__.py b/lib/ansible/modules/utilities/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/utilities/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/utilities/helper/__init__.py b/lib/ansible/modules/utilities/helper/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/utilities/helper/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/utilities/logic/__init__.py b/lib/ansible/modules/utilities/logic/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ansible/modules/utilities/logic/__init__.py
+++ /dev/null
diff --git a/lib/ansible/modules/utilities/logic/wait_for.py b/lib/ansible/modules/wait_for.py
index fdfbea545f..fdfbea545f 100644
--- a/lib/ansible/modules/utilities/logic/wait_for.py
+++ b/lib/ansible/modules/wait_for.py
diff --git a/lib/ansible/modules/utilities/logic/wait_for_connection.py b/lib/ansible/modules/wait_for_connection.py
index e3c65f4399..e3c65f4399 100644
--- a/lib/ansible/modules/utilities/logic/wait_for_connection.py
+++ b/lib/ansible/modules/wait_for_connection.py
diff --git a/lib/ansible/modules/packaging/os/yum.py b/lib/ansible/modules/yum.py
index 68d4ff1e8e..68d4ff1e8e 100644
--- a/lib/ansible/modules/packaging/os/yum.py
+++ b/lib/ansible/modules/yum.py
diff --git a/lib/ansible/modules/packaging/os/yum_repository.py b/lib/ansible/modules/yum_repository.py
index a709156aab..a709156aab 100644
--- a/lib/ansible/modules/packaging/os/yum_repository.py
+++ b/lib/ansible/modules/yum_repository.py