From 84b01a968460192c3fb18fa65630984b6ddf1123 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 26 Feb 2025 15:33:52 +0100 Subject: [PATCH] Use distro-specific SSH service name Some Ubuntu 24.04 images do not contain sshd service anymore, thus fail on the handler. Let's use distro-specific service name, like we do in other places. Change-Id: Ie5b0f215cceb8e8002b75543f4050042732525a7 --- handlers/main.yml | 2 +- vars/debian-host.yml | 2 ++ vars/redhat-host.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 8e4aa004..8d7938b0 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -45,7 +45,7 @@ - name: Restart sshd ansible.builtin.service: - name: sshd + name: "{{ lxc_ssh_service_name }}" state: "restarted" enabled: true diff --git a/vars/debian-host.yml b/vars/debian-host.yml index 28093a3e..d3c5a38c 100644 --- a/vars/debian-host.yml +++ b/vars/debian-host.yml @@ -45,7 +45,9 @@ _lxc_hosts_distro_packages: lxc_hosts_remove_distro_packages: - dnsmasq +lxc_ssh_service_name: ssh lxc_xz_bin: xz + system_config_dir: "/etc/default" systemd_utils_prefix: "/lib/systemd" diff --git a/vars/redhat-host.yml b/vars/redhat-host.yml index 16e70303..59644ba1 100644 --- a/vars/redhat-host.yml +++ b/vars/redhat-host.yml @@ -38,4 +38,6 @@ _lxc_hosts_distro_packages: - unzip - xz +lxc_ssh_service_name: sshd + lxc_xz_bin: xz