diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf961a036636b0e73f6a858085a26e4d21f789e5..1bd9f4757e509259d9279d9ca3dd4b5e6d7a27c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,21 +140,21 @@ default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
+default-centos-8-master-py3: {extends: '.test_instance'}
default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'}
default-fedora-33-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
-# default-arch-base-latest-master-py3: {extends: '.test_instance'}
+default-arch-base-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-rockylinux-8-master-py3: {extends: '.test_instance'}
+default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+default-almalinux-8-master-py3: {extends: '.test_instance'}
+default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index 5c2f37bee187148302bff6417e6ec645dceace90..941af60a9536f441e15eaa383af27f5bd69a2086 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,21 +100,21 @@ jobs:
- env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3
- # - env: INSTANCE=default-centos-8-master-py3
+ - env: INSTANCE=default-centos-8-master-py3
- env: INSTANCE=default-centos-7-master-py3
- env: INSTANCE=default-fedora-34-master-py3
- env: INSTANCE=default-fedora-33-master-py3
- # - env: INSTANCE=default-opensuse-leap-153-master-py3
- # - env: INSTANCE=default-opensuse-leap-152-master-py3
- # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+ - env: INSTANCE=default-opensuse-leap-153-master-py3
+ - env: INSTANCE=default-opensuse-leap-152-master-py3
+ - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
- env: INSTANCE=default-amazonlinux-2-master-py3
- # - env: INSTANCE=default-oraclelinux-8-master-py3
+ - env: INSTANCE=default-oraclelinux-8-master-py3
# - env: INSTANCE=default-oraclelinux-7-master-py3
- # - env: INSTANCE=default-arch-base-latest-master-py3
+ - env: INSTANCE=default-arch-base-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
- # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
- # - env: INSTANCE=default-almalinux-8-master-py3
- # - env: INSTANCE=default-rockylinux-8-master-py3
+ - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+ - env: INSTANCE=default-almalinux-8-master-py3
+ - env: INSTANCE=default-rockylinux-8-master-py3
# - env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3
diff --git a/systemd/defaults.yaml b/systemd/defaults.yaml
index c49268c41e134268b46f471ad268f3d4609ec4aa..0beec5683b0db00c19e6319bdfde8e184dd3df69 100644
--- a/systemd/defaults.yaml
+++ b/systemd/defaults.yaml
@@ -25,7 +25,7 @@ systemd:
fileattr: {}
path: /etc/systemd/network
service: systemd-networkd
- wait_online: true
+ wait_online: false
resolved:
config_source: file
diff --git a/systemd/networkd/init.sls b/systemd/networkd/init.sls
index 8c7e1976b9f91858da519634d3f5c7f480206921..3d23216f3400c7aac43a86d96767343b15ac86ac 100644
--- a/systemd/networkd/init.sls
+++ b/systemd/networkd/init.sls
@@ -2,6 +2,7 @@
{%- from "systemd/libtofs.jinja" import files_switch with context -%}
{%- set networkd = systemd.get('networkd', {}) %}
+{%- set service_wait_online = 'systemd-networkd-wait-online' %}
networkd:
{%- if networkd.pkg %}
@@ -31,8 +32,11 @@ networkd:
- enable: True
{%- if networkd.wait_online %}
+wait_online-service-enabled:
+ service.enabled:
+ - name: {{ service_wait_online }}
+
wait_online:
service.running:
- - name: systemd-networkd-wait-online
- - enable: True
+ - name: {{ service_wait_online }}
{%- endif %}
diff --git a/systemd/osfamilymap.yaml b/systemd/osfamilymap.yaml
index c072a6f8ace576a8bed61db582f5431dba6ede16..526ddd32922894f492bbada0cd0bb4dcab34b997 100644
--- a/systemd/osfamilymap.yaml
+++ b/systemd/osfamilymap.yaml
@@ -11,7 +11,6 @@ Debian:
pkgs_libs:
- libsystemd0
pkgs_extra:
- - python-systemd
- python3-systemd
resolved:
pkg: libnss-resolve
@@ -21,9 +20,8 @@ RedHat:
pkgs_libs:
- systemd-libs
pkgs_extra:
- - systemd-python
+ - python3-systemd
resolved:
- pkg: systemd-resolved
resolv_target: /run/systemd/resolve/resolv.conf
networkd:
pkg: systemd-networkd
@@ -33,7 +31,6 @@ Arch:
- systemd-libs
pkgs_extra:
- python-systemd
- - python2-systemd
resolved:
resolv_target: /run/systemd/resolve/stub-resolv.conf
@@ -42,5 +39,12 @@ Suse:
- libsystemd0
pkgs_extra:
- util-linux-systemd
+ networkd:
+ pkg: systemd-network
resolved:
pkg: nss-resolve
+
+Gentoo:
+ pkg: sys-apps/systemd
+ pkgs_extra:
+ - dev-python/python-systemd
diff --git a/systemd/osfingermap.yaml b/systemd/osfingermap.yaml
index d5da8218a9be0d7725b8c5d0bf02c0d9c93157dc..fa5b58c40f105b7eb44620ea86c874377e758f2b 100644
--- a/systemd/osfingermap.yaml
+++ b/systemd/osfingermap.yaml
@@ -7,39 +7,26 @@
# Only add an `osfinger` which is/will be supported by the formula
# (empty `osfinger`s do not need to be listed, just added here as an example).
---
-Debian-11:
- pkgs_extra:
- - python3-systemd
- # TODO: Return back to this and check if the following two lines can be removed,
- # in order to use the setting in `defaults.yaml` instead (i.e. `true`).
- # Using it for this initial phase of introducing pre-release Bullseye CI
- # testing; the `systemd-networkd-wait-online` service doesn't start.
+# os_family/os: Debian/Debian
+Debian-9:
networkd:
- wait_online: false
+ wait_online: true
-Ubuntu-20.04:
+# os_family/os: RedHat/CentOS
+CentOS Linux-7:
pkgs_extra:
- - python3-systemd
-Ubuntu-18.04: {}
+ - systemd-python
+ networkd:
+ wait_online: true
-CentOS Stream-8:
- pkgs_lib:
- - systemd-libs
+# os_family/os: RedHat/Amazon
+Amazon Linux-2:
pkgs_extra:
- - python3-systemd
- resolved:
- pkg: {}
-CentOS Linux-8:
- pkgs_lib:
- - systemd-libs
- pkgs_extra:
- - python3-systemd
- resolved:
- pkg: {}
-
-Fedora-33:
+ - systemd-python
networkd:
- pkg: systemd-networkd
-Fedora-34:
- networkd:
- pkg: systemd-networkd
+ wait_online: true
+
+# os_family/os: RedHat/OEL
+Oracle Linux Server-7:
+ pkgs_extra:
+ - systemd-python
diff --git a/systemd/osmap.yaml b/systemd/osmap.yaml
index 3269553cfe37bb56f2200ce16ba5300bd6fda377..84a906b8b1ff1ff7b377f389750df588de4718e7 100644
--- a/systemd/osmap.yaml
+++ b/systemd/osmap.yaml
@@ -9,12 +9,5 @@
---
# os_family: RedHat
Fedora:
- pkgs_libs:
- - systemd-libs
- pkgs_extra:
- - python3-systemd
networkd:
networkctl_reload: true
- pkg: {}
- resolved:
- pkg: {}
diff --git a/test/salt/states/rsync_test_package/init.sls b/test/salt/states/rsync_test_package/init.sls
index 1a96eb81b98f77ce562b6b5cab5c64c4e2b8580e..43451258e1edb644454074d6a5b15fbdaf142f86 100644
--- a/test/salt/states/rsync_test_package/init.sls
+++ b/test/salt/states/rsync_test_package/init.sls
@@ -1,6 +1,6 @@
rsync_test_package:
pkg.installed:
- - name: rsync
+ - name: {{ 'net-misc/rsync' if grains.os_family == 'Gentoo' else 'rsync' }}
rsync_test_file:
file.managed: