From f843ffdef33b606e1f68fdd956fee410bef07136 Mon Sep 17 00:00:00 2001 From: Sebastian Tobie Date: Sun, 11 Feb 2024 20:35:06 +0100 Subject: [PATCH] fixed the import of the module to the correct one --- CHANGELOG.rst | 5 ++++- changelogs/changelog.yaml | 6 +++++- galaxy.yml | 2 +- plugins/modules/link.py | 4 ++-- plugins/modules/mount.py | 4 ++-- plugins/modules/netdev.py | 4 ++-- plugins/modules/network.py | 4 ++-- plugins/modules/socket.py | 4 ++-- plugins/modules/system_service.py | 4 ++-- plugins/modules/target.py | 4 ++-- plugins/modules/unit.py.example | 4 ++-- 11 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 92c5617..ac2461a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,13 @@ ===================================== -sebastian.systemd 0.3.6 Release Notes +sebastian.systemd 0.3.7 Release Notes ===================================== .. contents:: Topics +v0.3.7 +====== + v0.3.6 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 63ed548..dfa1b52 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -51,6 +51,10 @@ releases: release_summary: added some ignores and changed my name release_date: "2023-12-30" 0.3.6: - release_date: "2024-02-11" changes: release_summary: fixed the import of the module utils + release_date: "2024-02-11" + 0.3.7: + changes: + release_summary: fixed the import path + release_date: "2024-02-11" diff --git a/galaxy.yml b/galaxy.yml index 849920a..a7e922d 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: sebastian name: systemd -version: 0.3.6 +version: 0.3.7 readme: README.md diff --git a/plugins/modules/link.py b/plugins/modules/link.py index 823ccca..2010ac1 100644 --- a/plugins/modules/link.py +++ b/plugins/modules/link.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec from ansible_module.module_utils.module import SystemdUnitModule except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec - from ansible.module_utils.sebastian.base.module_utils.module import SystemdUnitModule + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec + from ansible_collections.sebastian.base.module_utils.module import SystemdUnitModule class Module(SystemdUnitModule): # type: ignore diff --git a/plugins/modules/mount.py b/plugins/modules/mount.py index 0617a82..bf03ec0 100644 --- a/plugins/modules/mount.py +++ b/plugins/modules/mount.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec from ansible_module.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec - from ansible.module_utils.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec + from ansible_collections.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable SYSTEMD_SERVICE_CONFIG = pathlib.Path("/etc/systemd/system") diff --git a/plugins/modules/netdev.py b/plugins/modules/netdev.py index 9ab0459..fca3f56 100644 --- a/plugins/modules/netdev.py +++ b/plugins/modules/netdev.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, joindict, modspec, systemdbool from ansible_module.module_utils.module import SystemdUnitModule except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, joindict, modspec, systemdbool - from ansible.module_utils.sebastian.base.module_utils.module import SystemdUnitModule + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, joindict, modspec, systemdbool + from ansible_collections.sebastian.base.module_utils.module import SystemdUnitModule kinds = ( "bond", diff --git a/plugins/modules/network.py b/plugins/modules/network.py index 3051a84..2eda377 100644 --- a/plugins/modules/network.py +++ b/plugins/modules/network.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec, systemdbool from ansible_module.module_utils.module import SystemdUnitModule except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec, systemdbool - from ansible.module_utils.sebastian.base.module_utils.module import SystemdUnitModule + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_NETWORK_CONFIG, Types, modspec, systemdbool + from ansible_collections.sebastian.base.module_utils.module import SystemdUnitModule class Module(SystemdUnitModule): # type: ignore diff --git a/plugins/modules/socket.py b/plugins/modules/socket.py index 7cf7d2a..49f85b1 100644 --- a/plugins/modules/socket.py +++ b/plugins/modules/socket.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec from ansible_module.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec - from ansible.module_utils.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modspec + from ansible_collections.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable @installable diff --git a/plugins/modules/system_service.py b/plugins/modules/system_service.py index 716ce65..1e0ca2d 100644 --- a/plugins/modules/system_service.py +++ b/plugins/modules/system_service.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types from ansible_module.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types - from ansible.module_utils.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types + from ansible_collections.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable @installable diff --git a/plugins/modules/target.py b/plugins/modules/target.py index c352074..4c0cb9b 100644 --- a/plugins/modules/target.py +++ b/plugins/modules/target.py @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, systemdbool from ansible_module.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, systemdbool - from ansible.module_utils.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, systemdbool + from ansible_collections.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable __module_name__ = "TargetModule" diff --git a/plugins/modules/unit.py.example b/plugins/modules/unit.py.example index 2b6fe52..aa346aa 100644 --- a/plugins/modules/unit.py.example +++ b/plugins/modules/unit.py.example @@ -6,8 +6,8 @@ try: from ansible_module.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modpec from ansible_module.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable except ImportError: - from ansible.module_utils.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modpec - from ansible.module_utils.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable + from ansible_collections.sebastian.base.module_utils.generic import SYSTEMD_SERVICE_CONFIG, Types, modpec + from ansible_collections.sebastian.base.module_utils.module import SystemdReloadMixin, SystemdUnitModule, installable @installable