From fbd28a170cee73e47067f3f8d2b4c4d32924b914 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 8 Dec 2024 19:11:02 +1100
Subject: [PATCH 1/2] feat: enable network manager on el9

- el9 doesnt have the network-scripts scripts
---
 site/profiles/manifests/almalinux/base.pp | 25 +++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/site/profiles/manifests/almalinux/base.pp b/site/profiles/manifests/almalinux/base.pp
index 1304b27..60a38f2 100644
--- a/site/profiles/manifests/almalinux/base.pp
+++ b/site/profiles/manifests/almalinux/base.pp
@@ -8,14 +8,21 @@ class profiles::almalinux::base (
       ensure => absent,
     }
   }
-  service {'NetworkManager':
-    ensure  => false,
-    enable  => false,
-    require => Package['network-scripts'],
-  }
-  -> service {'network':
-    ensure  => true,
-    enable  => true,
-    require => Package['network-scripts'],
+  if $facts['os']['release'] == '8' {
+    service {'NetworkManager':
+      ensure  => false,
+      enable  => false,
+      require => Package['network-scripts'],
+    }
+    -> service {'network':
+      ensure  => true,
+      enable  => true,
+      require => Package['network-scripts'],
+    }
+  } elsif $facts['os']['release'] == '8' {
+    service {'NetworkManager':
+      ensure => true,
+      enable => true,
+    }
   }
 }
-- 
2.47.3


From 2d8178e78d51c0a72080629548f4aab79a58e210 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 8 Dec 2024 19:16:03 +1100
Subject: [PATCH 2/2] feat: remove network-scripts package for el9

- move network-scripts from all almalinux releases to just el8
---
 hieradata/os/AlmaLinux/AlmaLinux8.yaml   | 2 ++
 hieradata/os/AlmaLinux/all_releases.yaml | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hieradata/os/AlmaLinux/AlmaLinux8.yaml b/hieradata/os/AlmaLinux/AlmaLinux8.yaml
index 7861fca..2b20df9 100644
--- a/hieradata/os/AlmaLinux/AlmaLinux8.yaml
+++ b/hieradata/os/AlmaLinux/AlmaLinux8.yaml
@@ -1,2 +1,4 @@
 # hieradata/os/AlmaLinux/AlmaLinux8.yaml
 ---
+profiles::packages::include:
+  network-scripts: {}
diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml
index 49da93e..998e923 100644
--- a/hieradata/os/AlmaLinux/all_releases.yaml
+++ b/hieradata/os/AlmaLinux/all_releases.yaml
@@ -10,7 +10,6 @@ hiera_include:
 
 profiles::packages::include:
   lzo: {}
-  network-scripts: {}
   policycoreutils: {}
   unar: {}
   xz: {}
-- 
2.47.3