From 37fcac0ba8443888ccada569ae1997ea47a142c4 Mon Sep 17 00:00:00 2001
From: Patrik Holmqvist <pahol@sunet.se>
Date: Thu, 19 Dec 2024 10:56:15 +0100
Subject: [PATCH] Apparmor is included by default in ubuntu24.

---
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 47d3e11d..6c6bc5a1 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -45,7 +45,10 @@ class common {
   }
 
   include apt
-  include apparmor
+  # Only import appaprmor for ubuntu22 and older
+  if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '22.04') <= 0 ){
+   include apparmor
+  }
   include sunet::packages::jq
   package { 'needrestart': ensure => installed}
   package {'lshw': ensure => 'latest'}