From 631732651514ae6a95b28d33d8d278e6d73ae1bf Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 14 Nov 2023 02:55:32 +0100 Subject: [PATCH 1/2] feat(suse): restart minion using systemd-run The delayed restart using is a nice feature, but the "at" tool is outdated. Implement the same functionality using systemd-run and introduce a "restart_via_systemd" setting to toggle it. Signed-off-by: Georg Pfuetzenreuter --- pillar.example | 2 ++ salt/defaults.yaml | 1 + salt/minion.sls | 8 ++++++-- test/integration/default/files/_mapdata/almalinux-8.yaml | 1 + test/integration/default/files/_mapdata/almalinux-9.yaml | 1 + .../integration/default/files/_mapdata/amazonlinux-2.yaml | 1 + .../default/files/_mapdata/amazonlinux-2023.yaml | 1 + .../default/files/_mapdata/arch-base-latest.yaml | 1 + test/integration/default/files/_mapdata/centos-7.yaml | 1 + test/integration/default/files/_mapdata/centos-8.yaml | 1 + test/integration/default/files/_mapdata/centos-9.yaml | 1 + test/integration/default/files/_mapdata/debian-10.yaml | 1 + test/integration/default/files/_mapdata/debian-11.yaml | 1 + test/integration/default/files/_mapdata/debian-12.yaml | 1 + test/integration/default/files/_mapdata/debian-9.yaml | 1 + test/integration/default/files/_mapdata/fedora-33.yaml | 1 + test/integration/default/files/_mapdata/fedora-34.yaml | 1 + test/integration/default/files/_mapdata/fedora-35.yaml | 1 + test/integration/default/files/_mapdata/fedora-36.yaml | 1 + test/integration/default/files/_mapdata/fedora-40.yaml | 1 + test/integration/default/files/_mapdata/fedora-41.yaml | 1 + test/integration/default/files/_mapdata/freebsd-12.yaml | 1 + test/integration/default/files/_mapdata/freebsd-13.yaml | 1 + .../integration/default/files/_mapdata/gentoo-2-sysd.yaml | 1 + .../integration/default/files/_mapdata/gentoo-2-sysv.yaml | 1 + test/integration/default/files/_mapdata/mac_os_x-10.yaml | 1 + test/integration/default/files/_mapdata/mac_os_x-11.yaml | 1 + test/integration/default/files/_mapdata/mac_os_x-12.yaml | 1 + test/integration/default/files/_mapdata/openbsd-6.yaml | 1 + test/integration/default/files/_mapdata/openbsd-7.yaml | 1 + test/integration/default/files/_mapdata/opensuse-15.yaml | 1 + .../default/files/_mapdata/opensuse-tumbleweed.yaml | 1 + .../integration/default/files/_mapdata/oraclelinux-7.yaml | 1 + .../integration/default/files/_mapdata/oraclelinux-8.yaml | 1 + .../integration/default/files/_mapdata/oraclelinux-9.yaml | 1 + test/integration/default/files/_mapdata/rockylinux-8.yaml | 1 + test/integration/default/files/_mapdata/rockylinux-9.yaml | 1 + test/integration/default/files/_mapdata/ubuntu-18.yaml | 1 + test/integration/default/files/_mapdata/ubuntu-20.yaml | 1 + test/integration/default/files/_mapdata/ubuntu-22.yaml | 1 + test/integration/default/files/_mapdata/ubuntu-24.yaml | 1 + test/integration/default/files/_mapdata/windows-10.yaml | 1 + .../default/files/_mapdata/windows-2016-server.yaml | 1 + .../default/files/_mapdata/windows-2019-server.yaml | 1 + .../default/files/_mapdata/windows-2022-server.yaml | 1 + test/integration/default/files/_mapdata/windows-8.yaml | 1 + 46 files changed, 52 insertions(+), 2 deletions(-) diff --git a/pillar.example b/pillar.example index dd4088237..2c75741a7 100644 --- a/pillar.example +++ b/pillar.example @@ -173,6 +173,8 @@ salt: # salt minion config: minion_config_use_TOFS: true + # schedule delayed minion restart on configuration changes + restart_via_systemd: false minion: # standalone setup diff --git a/salt/defaults.yaml b/salt/defaults.yaml index 2b84eec3e..dcf2dd669 100644 --- a/salt/defaults.yaml +++ b/salt/defaults.yaml @@ -11,6 +11,7 @@ salt: use_pip: false clean_config_d_dir: true restart_via_at: false + restart_via_systemd: false parallel: true # salt.git module argument config_path: /etc/salt diff --git a/salt/minion.sls b/salt/minion.sls index 34362449a..6f4d41aa6 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -107,7 +107,7 @@ salt-minion: - file: remove-old-minion-conf-file - order: last {% endif %} - {%- if not salt_settings.restart_via_at %} + {%- if not salt_settings.restart_via_at and not salt_settings.restart_via_systemd %} cmd.run: {%- if grains['saltversioninfo'] >= [ 2016, 3 ] %} {%- if grains['kernel'] == 'Windows' %} @@ -142,7 +142,7 @@ salt-minion: - file: remove-old-minion-conf-file {%- else %} - {% if grains.os_family not in ['MacOS', 'FreeBSD'] %} + {%- if grains.os_family not in ['MacOS', 'FreeBSD'] and not salt_settings.restart_via_systemd %} {# MacOS and FreeBSD have the 'at' command; but there's no package to install #} at: pkg.installed: @@ -151,7 +151,11 @@ at: restart-salt-minion: cmd.run: + {%- if salt_settings.restart_via_systemd %} + - name: systemd-run --on-active=1m systemctl restart salt-minion + {%- else %} - name: echo salt-call --local service.restart {{ salt_settings.minion_service }} | at now + 1 minute + {%- endif %} - order: last - onchanges: {%- if salt_settings.install_packages %} diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 8633ac51a..7eb8fee4c 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/almalinux-9.yaml b/test/integration/default/files/_mapdata/almalinux-9.yaml index c27ba3077..2c8e23d65 100644 --- a/test/integration/default/files/_mapdata/almalinux-9.yaml +++ b/test/integration/default/files/_mapdata/almalinux-9.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 175f20082..545907349 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2023.yaml b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml index d414720e2..5d9dae60a 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2023.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 798f5ffd8..c35d50a21 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -95,6 +95,7 @@ values: python_git: python2-gitpython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 72ccc36dc..29d3bebf7 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 65a6b1eb5..69879605b 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/centos-9.yaml b/test/integration/default/files/_mapdata/centos-9.yaml index acd292c32..948f62b51 100644 --- a/test/integration/default/files/_mapdata/centos-9.yaml +++ b/test/integration/default/files/_mapdata/centos-9.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index e3d07ce26..dcdda5a20 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -97,6 +97,7 @@ values: python_git: python-git release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 4ec2914ee..19ac099c2 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -96,6 +96,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/debian-12.yaml b/test/integration/default/files/_mapdata/debian-12.yaml index 80e2549ab..b64728326 100644 --- a/test/integration/default/files/_mapdata/debian-12.yaml +++ b/test/integration/default/files/_mapdata/debian-12.yaml @@ -96,6 +96,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 9ed161606..e8b3d2ccc 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -97,6 +97,7 @@ values: python_git: python-git release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 4187c7e0a..61708bf4b 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index bf86114e3..085e14cdb 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 13c0f8129..19fe8124e 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index b006dde53..b58ed94e5 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-40.yaml b/test/integration/default/files/_mapdata/fedora-40.yaml index b006dde53..b58ed94e5 100644 --- a/test/integration/default/files/_mapdata/fedora-40.yaml +++ b/test/integration/default/files/_mapdata/fedora-40.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/fedora-41.yaml b/test/integration/default/files/_mapdata/fedora-41.yaml index 6cbf60ebd..0761e0adc 100644 --- a/test/integration/default/files/_mapdata/fedora-41.yaml +++ b/test/integration/default/files/_mapdata/fedora-41.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml index c6aa88aa0..e6e634135 100644 --- a/test/integration/default/files/_mapdata/freebsd-12.yaml +++ b/test/integration/default/files/_mapdata/freebsd-12.yaml @@ -93,6 +93,7 @@ values: python_git: py39-gitpython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml index ec8d79567..71c2322ee 100644 --- a/test/integration/default/files/_mapdata/freebsd-13.yaml +++ b/test/integration/default/files/_mapdata/freebsd-13.yaml @@ -93,6 +93,7 @@ values: python_git: py39-gitpython release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 008272c99..98f07184f 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -93,6 +93,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 008272c99..98f07184f 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -93,6 +93,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/mac_os_x-10.yaml b/test/integration/default/files/_mapdata/mac_os_x-10.yaml index b8f0fa7c1..cfcf4f062 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-10.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-10.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/mac_os_x-11.yaml b/test/integration/default/files/_mapdata/mac_os_x-11.yaml index b8f0fa7c1..cfcf4f062 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-11.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-11.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/mac_os_x-12.yaml b/test/integration/default/files/_mapdata/mac_os_x-12.yaml index b8f0fa7c1..cfcf4f062 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-12.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-12.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/openbsd-6.yaml b/test/integration/default/files/_mapdata/openbsd-6.yaml index 56605f52f..691eafad4 100644 --- a/test/integration/default/files/_mapdata/openbsd-6.yaml +++ b/test/integration/default/files/_mapdata/openbsd-6.yaml @@ -92,6 +92,7 @@ values: python_git: py3-GitPython release: '3002' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/openbsd-7.yaml b/test/integration/default/files/_mapdata/openbsd-7.yaml index 4d71f3bf1..c4c4d3691 100644 --- a/test/integration/default/files/_mapdata/openbsd-7.yaml +++ b/test/integration/default/files/_mapdata/openbsd-7.yaml @@ -92,6 +92,7 @@ values: python_git: py3-GitPython release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index bf09fc6c0..3d1551fe8 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index f0b0ca232..134a36033 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 6ae269440..ec6735037 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -96,6 +96,7 @@ values: python_git: GitPython release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 4ab6757ee..7301c44aa 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/oraclelinux-9.yaml b/test/integration/default/files/_mapdata/oraclelinux-9.yaml index 426bf7093..7cd86013f 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-9.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-9.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index f4e129e02..aba926cee 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/rockylinux-9.yaml b/test/integration/default/files/_mapdata/rockylinux-9.yaml index 73e947d8b..809ee9aec 100644 --- a/test/integration/default/files/_mapdata/rockylinux-9.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-9.yaml @@ -95,6 +95,7 @@ values: python_dulwich: python-dulwich python_git: GitPython restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 1bd674418..1bb2f742c 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -99,6 +99,7 @@ values: python_git: python-git release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 8f0e84e21..3c81da0d2 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -98,6 +98,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml index efcbaffb2..dcc96386b 100644 --- a/test/integration/default/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml @@ -98,6 +98,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/ubuntu-24.yaml b/test/integration/default/files/_mapdata/ubuntu-24.yaml index 7dcb575a4..314b73cdc 100644 --- a/test/integration/default/files/_mapdata/ubuntu-24.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-24.yaml @@ -98,6 +98,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/windows-10.yaml b/test/integration/default/files/_mapdata/windows-10.yaml index 82b75c648..680b74189 100644 --- a/test/integration/default/files/_mapdata/windows-10.yaml +++ b/test/integration/default/files/_mapdata/windows-10.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml index 87d32e60b..db36f407e 100644 --- a/test/integration/default/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2016-server.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3003' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml index 2f710071b..82461777f 100644 --- a/test/integration/default/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2019-server.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/windows-2022-server.yaml b/test/integration/default/files/_mapdata/windows-2022-server.yaml index 44576773b..4148533de 100644 --- a/test/integration/default/files/_mapdata/windows-2022-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2022-server.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml index 65342e95a..d519aa5a3 100644 --- a/test/integration/default/files/_mapdata/windows-8.yaml +++ b/test/integration/default/files/_mapdata/windows-8.yaml @@ -92,6 +92,7 @@ values: python_git: python-git release: '3004' restart_via_at: false + restart_via_systemd: false retry_options: attempts: 5 interval: 10 From 09f73356e03a30768904b072ae514da7a7e3547a Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 14 Nov 2023 02:56:49 +0100 Subject: [PATCH 2/2] feat(suse): enable restart_via_systemd Signed-off-by: Georg Pfuetzenreuter --- salt/osfamilymap.yaml | 1 + test/integration/default/files/_mapdata/opensuse-15.yaml | 2 +- .../integration/default/files/_mapdata/opensuse-tumbleweed.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index 2ed22ec93..00ecf9a23 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -72,6 +72,7 @@ Suse: install_from_package: git master: gitfs_provider: pygit2 + restart_via_systemd: true Gentoo: salt_master: app-admin/salt diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 3d1551fe8..1dd6226b9 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -95,7 +95,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false - restart_via_systemd: false + restart_via_systemd: true retry_options: attempts: 5 interval: 10 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 134a36033..3df9fe908 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -95,7 +95,7 @@ values: python_dulwich: python-dulwich python_git: python-git restart_via_at: false - restart_via_systemd: false + restart_via_systemd: true retry_options: attempts: 5 interval: 10