From a5e64fa0fd02a45a77ec04042fed3c0fb59b2b3c Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Wed, 16 Oct 2024 08:31:38 -0400
Subject: [PATCH 1/2] Release v5.2.0

---
 CHANGELOG.md  | 13 +++++++++----
 metadata.json |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f48295..12d45b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.2.0](https://github.com/osc/puppet-module-openondemand/tree/v5.2.0) (2024-10-16)
+
+[Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v5.1.0...v5.2.0)
+
+### Added
+
+- Support Ubuntu 24.04 [\#163](https://github.com/OSC/puppet-module-openondemand/pull/163) ([treydock](https://github.com/treydock))
+- Remove EL7 support [\#161](https://github.com/OSC/puppet-module-openondemand/pull/161) ([treydock](https://github.com/treydock))
+
 ## [v5.1.0](https://github.com/osc/puppet-module-openondemand/tree/v5.1.0) (2024-09-06)
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v5.0.1...v5.1.0)
@@ -278,10 +287,6 @@ All notable changes to this project will be documented in this file. The format
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v2.2.0...v2.3.0)
 
-### Added
-
-- Support nginx\_stage passenger\_pool\_idle\_time and passenger\_options [\#58](https://github.com/OSC/puppet-module-openondemand/pull/58) ([treydock](https://github.com/treydock))
-
 ## [v2.2.0](https://github.com/osc/puppet-module-openondemand/tree/v2.2.0) (2021-06-03)
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v2.1.0...v2.2.0)
diff --git a/metadata.json b/metadata.json
index f8434ed..614d6a8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "osc-openondemand",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "author": "osc",
   "summary": "Open OnDemand Puppet module",
   "license": "Apache-2.0",

From 017c6561bc75a52136766e53ab343942b030a8fe Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Wed, 16 Oct 2024 08:34:38 -0400
Subject: [PATCH 2/2] Require stdlib >= 9.x

---
 manifests/cluster.pp | 2 +-
 manifests/conf.pp    | 2 +-
 manifests/init.pp    | 2 +-
 metadata.json        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/cluster.pp b/manifests/cluster.pp
index de21489..ffea831 100644
--- a/manifests/cluster.pp
+++ b/manifests/cluster.pp
@@ -330,7 +330,7 @@
   if $source {
     $content = undef
   } else {
-    $content = to_yaml($config)
+    $content = stdlib::to_yaml($config)
   }
 
   file { "/etc/ood/config/clusters.d/${name}.yml":
diff --git a/manifests/conf.pp b/manifests/conf.pp
index 0cdf874..5c4d707 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -36,7 +36,7 @@
   if $data {
     $_content = join([
         '# File managed by Puppet - DO NOT EDIT',
-        to_yaml($data, { 'line_width' => -1 }),
+        stdlib::to_yaml($data, { 'line_width' => -1 }),
         '',
     ], "\n")
   } elsif $content_template {
diff --git a/manifests/init.pp b/manifests/init.pp
index 39af7cb..5d08504 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -582,7 +582,7 @@
     'dex_uri'                          => $dex_uri,
     'dex'                              => $_dex_config,
   }.filter |$key, $value| { $value =~ NotUndef }
-  $ood_portal_yaml = to_yaml($ood_portal_config)
+  $ood_portal_yaml = stdlib::to_yaml($ood_portal_config)
   $base_apps = {
     'dashboard' => { 'package' => 'ondemand', 'manage_package' => false },
     'shell' => { 'package' => 'ondemand', 'manage_package' => false },
diff --git a/metadata.json b/metadata.json
index 614d6a8..229bda1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/apt",
@@ -38,7 +38,7 @@
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 0.4.0 <7.0.0"
+      "version_requirement": ">= 0.4.0 <8.0.0"
     },
     {
       "name": "puppet/epel",