diff options
| author | Ahmed Abdelhalim <[email protected]> | 2026-07-09 23:20:14 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2026-07-10 00:38:48 +0200 |
| commit | 31ab4af71809028695e747cc717dae0e45a21e8e (patch) | |
| tree | 0a46b0bbab2ab58a91e29669a9f5519e817d551a /roles/ethtool | |
| parent | 1cbb9df950175e698e1edc87953e8f4bfb22b88a (diff) | |
Extract logind lid configuration into it's own role
Diffstat (limited to 'roles/ethtool')
| -rw-r--r-- | roles/ethtool/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/ethtool/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/ethtool/meta/argument_specs.yml | 12 | ||||
| -rw-r--r-- | roles/ethtool/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/ethtool/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/ethtool/templates/logind.conf.j2 | 2 |
6 files changed, 2 insertions, 35 deletions
diff --git a/roles/ethtool/defaults/main.yml b/roles/ethtool/defaults/main.yml index 8da62da2..61cfd43e 100644 --- a/roles/ethtool/defaults/main.yml +++ b/roles/ethtool/defaults/main.yml @@ -1,3 +1,2 @@ --- ethtool_wol_interface: "eth0" -ethtool_lid_ac_action: "suspend" diff --git a/roles/ethtool/handlers/main.yml b/roles/ethtool/handlers/main.yml index 88cc1a15..f2b4275a 100644 --- a/roles/ethtool/handlers/main.yml +++ b/roles/ethtool/handlers/main.yml @@ -4,8 +4,3 @@ ansible.builtin.systemd_service: daemon_reload: true -- name: "Reload systemd-logind" - become: true - ansible.builtin.systemd_service: - name: "systemd-logind" - state: "restarted" diff --git a/roles/ethtool/meta/argument_specs.yml b/roles/ethtool/meta/argument_specs.yml index ef5aefad..8f6ce206 100644 --- a/roles/ethtool/meta/argument_specs.yml +++ b/roles/ethtool/meta/argument_specs.yml @@ -6,15 +6,3 @@ argument_specs: type: "str" description: "Network interface to enable Wake-on-LAN on" default: "eth0" - ethtool_lid_ac_action: - type: "str" - description: "HandleLidSwitchExternalPower value" - default: "suspend" - choices: - - "ignore" - - "suspend" - - "hibernate" - - "hybrid-sleep" - - "suspend-then-hibernate" - - "lock" - - "poweroff" diff --git a/roles/ethtool/meta/main.yml b/roles/ethtool/meta/main.yml index de7f32a3..e33a01b3 100644 --- a/roles/ethtool/meta/main.yml +++ b/roles/ethtool/meta/main.yml @@ -1,5 +1,6 @@ --- -dependencies: [] +dependencies: + - role: "logind" galaxy_info: author: "a14m" description: "Install ethtool and enable Wake-on-LAN via systemd service" diff --git a/roles/ethtool/tasks/main.yml b/roles/ethtool/tasks/main.yml index f92d052e..c9c67648 100644 --- a/roles/ethtool/tasks/main.yml +++ b/roles/ethtool/tasks/main.yml @@ -26,17 +26,3 @@ # WoL service fails in containers — ethtool_wol_interface does not exist - "molecule-notest" -- name: "Ensure /etc/systemd/logind.conf.d exists" - become: true - ansible.builtin.file: - path: "/etc/systemd/logind.conf.d" - state: "directory" - mode: "0755" - -- name: "Configure lid switch on AC power" - become: true - ansible.builtin.template: - src: "logind.conf.j2" - dest: "/etc/systemd/logind.conf.d/wol.conf" - mode: "0644" - notify: "Reload systemd-logind" diff --git a/roles/ethtool/templates/logind.conf.j2 b/roles/ethtool/templates/logind.conf.j2 deleted file mode 100644 index 722e3a8a..00000000 --- a/roles/ethtool/templates/logind.conf.j2 +++ /dev/null @@ -1,2 +0,0 @@ -[Login] -HandleLidSwitchExternalPower={{ ethtool_lid_ac_action }} |