Skip to content

Test branch #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepak7340 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test branch #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d826b6a
Testing hiera branch wip
Mar 18, 2026
0d3d2c7
Use python_version from Hiera for RedHat package installation
Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/upstream/slurm/data/os/RedHat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
slurm::python_version: 'python36'
1 change: 1 addition & 0 deletions modules/upstream/slurm/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 5 additions & 1 deletion modules/upstream/slurm/manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -38,7 +42,7 @@
'libX11-devel',
'libssh2-devel',
'libevent-devel',
'python3', 'python3-devel',
$python_version, "${python_version}-devel",
],
default => []
}
Expand Down
15 changes: 8 additions & 7 deletions modules/upstream/slurm/manifests/pmix/build.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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}/")
Expand Down
Loading