Merge pull request #389 from Cray-HPE/casmcms-9165-csm-1.4

CASMCMS-9165: Fix per-bootset CFS setting
Cray-HPE · Oct 15, 2024 · b6d4957 · b6d4957
2 parents 9758dcd + 2f3efa2
commit b6d4957
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix per-bootset CFS setting
 
 ## [2.0.46] - 2024-09-26
 ### Fixed

diff --git a/src/bos/operators/session_setup.py b/src/bos/operators/session_setup.py
@@ -285,7 +285,7 @@ def _get_configuration_from_boot_set(self, boot_set: dict):
         """
         if not self.template.get('enable_cfs', True):
             return ''
-        bs_config = boot_set.get('configuration', '')
+        bs_config = boot_set.get('cfs', {}).get('configuration', '')
         if bs_config:
             return bs_config
         # Otherwise, we take the configuration value from the session template itself