Merge pull request #286 from Cray-HPE/backport-2.6

CRAYSAT-1935: create_image_customization_session() missing `image_name` argument
Cray-HPE · Nov 14, 2024 · ae65589 · ae65589
2 parents bf9b104 + 1fad4fb
commit ae65589
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,12 @@ 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).
 
+## [3.25.16] - 2024-11-13
+
+### Changed
+- Updated `begin_image_configure` to pass session name generated to address the
+  sat bootprep incorrect logging of 2 session names
+
 ## [3.25.15] - 2024-10-10
 
 ### Changed

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # Top-level requirements for sat package to function.
-# (C) Copyright 2019-2023 Hewlett Packard Enterprise Development LP.
+# (C) Copyright 2019-2024 Hewlett Packard Enterprise Development LP.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

diff --git a/sat/cli/bootprep/input/image.py b/sat/cli/bootprep/input/image.py
@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# (C) Copyright 2021-2023 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2021-2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -403,7 +403,7 @@ def begin_image_configure(self):
 
         try:
             self.image_configure_session = self.cfs_client.create_image_customization_session(
-                self.configuration, self.image_id_to_configure, self.configuration_group_names, self.name)
+                session_name, self.configuration, self.image_id_to_configure, self.configuration_group_names, self.name)
         except APIError as err:
             raise ImageCreateError(f'Failed to launch image customization CFS session: {err}')