Merge branch 'release/2.10' into CASMCMS-9162-release-2.10

CHANGELOG.md

@@ -5,12 +5,17 @@ All notable changes to this project will be documented in this file.
 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]
+
 ## [2.10.28] - 2024-10-15
 ### Added
 #### BOS option
 - cfs_read_timeout: Allow the amount of time BOS waits for a response from CFS before
   timing out to be configurable
 
+### Fixed
+- Fix per-bootset CFS setting
+
 ## [2.10.27] - 2024-10-14
 ### Fixed
 - Fix incorrect keyword argument in base operator logging call

src/bos/operators/session_setup.py

@@ -344,7 +344,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