Version 0.32.1 - no compat mode

aursu · Feb 19, 2025 · 9bd6037 · 9bd6037
1 parent 7f80e3c
commit 9bd6037
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -681,12 +681,13 @@ node on Puppet server.
 
 **Known Issues**
 
-## Release 0.32.0
+## Release 0.32.1
 
 **Features**
 
 **Bugfixes**
 
 * Compatibility with r10k >= 13.0.0 and Puppet 7
+* Disabled compatibility mode for Ubuntu as vendor packages are already available
 
 **Known Issues**
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -44,18 +44,22 @@
     $r10k_package_provider = 'puppet_gem'
     $r10k_path             = '/opt/puppetlabs/puppet/bin/r10k'
 
-    # define packages' versions on Ubuntu 24.04 in compat mode
-    if $puppet::params::compat_mode and $compat_mode {
-      # packages from Ubuntu 22.04 on Ubuntu 24.04 (18/12/2024)
-      $agent_version = '8.10.0-1jammy'
-      $server_version = '8.7.0-1jammy'
-      $puppetdb_version = '8.8.1-1jammy'
-    }
-    else {
-      $agent_version = 'installed'
-      $server_version = 'installed'
-      $puppetdb_version = 'installed'
-    }
+    # # define packages' versions on Ubuntu 24.04 in compat mode
+    # if $puppet::params::compat_mode and $compat_mode {
+    #   # packages from Ubuntu 22.04 on Ubuntu 24.04 (18/12/2024)
+    #   $agent_version = '8.10.0-1jammy'
+    #   $server_version = '8.7.0-1jammy'
+    #   $puppetdb_version = '8.8.1-1jammy'
+    # }
+    # else {
+    #   $agent_version = 'installed'
+    #   $server_version = 'installed'
+    #   $puppetdb_version = 'installed'
+    # }
+
+    $agent_version = 'installed'
+    $server_version = 'installed'
+    $puppetdb_version = 'installed'
   }
   else {
     $server_confdir    = '/etc/puppet/puppetserver'

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -66,23 +66,27 @@
     }
   }
 
-  if $os_name == 'Ubuntu' and $version_codename == 'noble' {
-    $puppet_platform_distro = false
-    $compat_mode = true
+  # if $os_name == 'Ubuntu' and $version_codename == 'noble' {
+  #   $puppet_platform_distro = false
+  #   $compat_mode = true
+  #   # OS vendor's distribution packages (18/12/2024)
+  #   $agent_version = '8.4.0-1'
+  #   $server_version = '8.4.0-1'
+  #   $puppetdb_version = '7.12.1-3'
+  # }
+  # else {
+  #   $puppet_platform_distro = true
+  #   $compat_mode = false
+  #   $agent_version = 'installed'
+  #   $server_version = 'installed'
+  #   $puppetdb_version = 'installed'
+  # }
 
-    # OS vendor's distribution packages (18/12/2024)
-    $agent_version = '8.4.0-1'
-    $server_version = '8.4.0-1'
-    $puppetdb_version = '7.12.1-3'
-  }
-  else {
-    $puppet_platform_distro = true
-    $compat_mode = false
-
-    $agent_version = 'installed'
-    $server_version = 'installed'
-    $puppetdb_version = 'installed'
-  }
+  $puppet_platform_distro = true
+  $compat_mode = false
+  $agent_version = 'installed'
+  $server_version = 'installed'
+  $puppetdb_version = 'installed'
 
   case $os_name {
     'CentOS', 'Rocky': {

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "aursu-puppet",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "author": "aursu",
   "summary": "Puppet server installation and setup",
   "license": "Apache-2.0",