From abd6ebc0ac4b7ab13a4e6ad00373fa468253624c Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Thu, 15 Feb 2024 16:33:02 -0500
Subject: [PATCH] Force cgroup/v1 on RHEL7 to avoid acceptance errors on Github
 Actions

---
 spec/spec_helper_acceptance_setup.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb
index 3615673..862ede3 100644
--- a/spec/spec_helper_acceptance_setup.rb
+++ b/spec/spec_helper_acceptance_setup.rb
@@ -50,6 +50,8 @@
   datadir: data
   data_hash: yaml_data
 hierarchy:
+  - name: osfamily-osmajor
+    path: "%{facts.os.family}%{facts.os.release.major}.yaml"
   - name: virtual
     path: "%{facts.virtual}.yaml"
   - name: "Munge"
@@ -80,9 +82,13 @@
   slurmd:
     cpus: 1
     HIERA
+    rhel7_yaml = <<-RHEL7
+slurm::cgroup_plugin: 'cgroup/v1'
+    RHEL7
     create_remote_file(hosts, '/etc/puppetlabs/puppet/hiera.yaml', hiera_yaml)
     on hosts, 'mkdir -p /etc/puppetlabs/puppet/data'
     create_remote_file(hosts, '/etc/puppetlabs/puppet/data/common.yaml', common_yaml)
+    create_remote_file(hosts, '/etc/puppetlabs/puppet/data/RedHat7.yaml', rhel7_yaml)
     # Hack to work around issues with recent systemd and docker and running services as non-root
     if fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 7
       service_hack = <<-HACK