From d826b6a592f79e80c223c792a7a65ba1f44de5f0 Mon Sep 17 00:00:00 2001
From: deepakt7340 <deepak@obmondo.com>
Date: Wed, 18 Mar 2026 13:00:30 +0530
Subject: [PATCH 1/2] Testing hiera branch wip

---
 puppet_enc.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet_enc.rb b/puppet_enc.rb
index 5c54c513..a630ac0b 100755
--- a/puppet_enc.rb
+++ b/puppet_enc.rb
@@ -23,7 +23,7 @@
 MAX_TAGS = 10
 
 # NOTE: Change this to your feature branch, if you want to test your input from hiera
-DEFAULT_HIERA_BRANCH = 'main'
+DEFAULT_HIERA_BRANCH = 'wip'
 
 (hostname, customer_id) = CERTNAME.split('.', 2)
 customer_host_re = /^[a-z0-9-]+$/

From 0d3d2c7258af9184a9d2f0ef234b968783dd5579 Mon Sep 17 00:00:00 2001
From: deepakt7340 <deepak@obmondo.com>
Date: Tue, 31 Mar 2026 16:22:44 +0530
Subject: [PATCH 2/2] Use python_version from Hiera for RedHat package
 installation

---
 modules/upstream/slurm/data/os/RedHat.yaml     |  2 ++
 modules/upstream/slurm/manifests/init.pp       |  1 +
 modules/upstream/slurm/manifests/params.pp     |  6 +++++-
 modules/upstream/slurm/manifests/pmix/build.pp | 15 ++++++++-------
 puppet_enc.rb                                  |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 modules/upstream/slurm/data/os/RedHat.yaml

diff --git a/modules/upstream/slurm/data/os/RedHat.yaml b/modules/upstream/slurm/data/os/RedHat.yaml
new file mode 100644
index 00000000..5f9360ab
--- /dev/null
+++ b/modules/upstream/slurm/data/os/RedHat.yaml
@@ -0,0 +1,2 @@
+---
+slurm::python_version: 'python36'
diff --git a/modules/upstream/slurm/manifests/init.pp b/modules/upstream/slurm/manifests/init.pp
index d4469c75..275b1241 100644
--- a/modules/upstream/slurm/manifests/init.pp
+++ b/modules/upstream/slurm/manifests/init.pp
@@ -756,6 +756,7 @@
   # PMIx settings -- see slurm::pmix class
   #
   Boolean $with_pmix                      = $slurm::params::with_pmix,
+  String  $python_version                 = $slurm::params::python_version,
   # String  $pmix_version                   = $slurm::params::pmix_version,
   # String  $pmix_checksum_type             = $slurm::params::pmix_src_checksum_type,
   # String  $pmix_checksum                  = $slurm::params::pmix_src_checksum,
diff --git a/modules/upstream/slurm/manifests/params.pp b/modules/upstream/slurm/manifests/params.pp
index 0b51d54c..c92b4ec4 100644
--- a/modules/upstream/slurm/manifests/params.pp
+++ b/modules/upstream/slurm/manifests/params.pp
@@ -25,6 +25,10 @@
   #### MODULE INTERNAL VARIABLES  #########
   # (Modify to adapt to unsupported OSes)
   #########################################
+  # Python version for RedHat systems (e.g., 'python3', 'python36', 'python38')
+  # Value is overridden by slurm class parameter $python_version (from hiera)
+  $python_version = 'python3'
+
   $pre_requisite_packages = $facts['os']['family'] ? {
     'Redhat' => [
       'hwloc', 'hwloc-devel', 'hwloc-plugins', 'numactl', 'numactl-devel',
@@ -38,7 +42,7 @@
       'libX11-devel',
       'libssh2-devel',
       'libevent-devel',
-      'python3', 'python3-devel',
+      $python_version, "${python_version}-devel",
     ],
     default => []
   }
diff --git a/modules/upstream/slurm/manifests/pmix/build.pp b/modules/upstream/slurm/manifests/pmix/build.pp
index 914b9f43..9afb0398 100644
--- a/modules/upstream/slurm/manifests/pmix/build.pp
+++ b/modules/upstream/slurm/manifests/pmix/build.pp
@@ -52,10 +52,11 @@
 # with slurm-libmpi).
 #
 define slurm::pmix::build (
-  Enum['present', 'absent'] $ensure  = $slurm::params::ensure,
-  String                    $srcdir  = $slurm::params::srcdir,
-  String                    $dir     = $slurm::params::builddir,
-  Array                     $defines = [],
+  Enum['present', 'absent'] $ensure         = $slurm::params::ensure,
+  String                    $srcdir         = $slurm::params::srcdir,
+  String                    $dir            = $slurm::params::builddir,
+  Array                     $defines        = [],
+  String                    $python_version = $slurm::python_version,
 ) {
   include slurm::params
 
@@ -91,13 +92,13 @@
           ensure => 'present',
         }
       }
-      if !defined(Package['python3-devel']) {
-        package { 'python3-devel':
+      if !defined(Package["${python_version}-devel"]) {
+        package { "${python_version}-devel":
           ensure => 'present',
         }
       }
       Yum::Group[$slurm::params::groupinstall] -> Exec[$buildname]
-      Package['libevent-devel'] -> Package['python3-devel'] -> Exec[$buildname]
+      Package['libevent-devel'] -> Package["${python_version}-devel"] -> Exec[$buildname]
 
       $rpmdir = "${dir}/RPMS/${facts['os']['architecture']}"
       $rpms = prefix(suffix($slurm::params::pmix_rpms, "-${version}*.rpm"), "${rpmdir}/")
diff --git a/puppet_enc.rb b/puppet_enc.rb
index a630ac0b..5c54c513 100755
--- a/puppet_enc.rb
+++ b/puppet_enc.rb
@@ -23,7 +23,7 @@
 MAX_TAGS = 10
 
 # NOTE: Change this to your feature branch, if you want to test your input from hiera
-DEFAULT_HIERA_BRANCH = 'wip'
+DEFAULT_HIERA_BRANCH = 'main'
 
 (hostname, customer_id) = CERTNAME.split('.', 2)
 customer_host_re = /^[a-z0-9-]+$/