Fix salt-cloud config dict update issue

zliang-akamai · Jan 4, 2024 · 06f1bba · 06f1bba
1 parent c5cfe21
commit 06f1bba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog/65789.fixed.md b/changelog/65789.fixed.md
@@ -0,0 +1 @@
+Fix the condition for salt-cloud config dict update
diff --git a/salt/config/__init__.py b/salt/config/__init__.py
@@ -3248,7 +3248,9 @@ def get_cloud_config_value(name, vm_, opts, default=None, search_global=True):
         # Let's get the value from the profile, if present
         if "profile" in vm_ and vm_["profile"] is not None:
             if name in opts["profiles"][vm_["profile"]]:
-                if isinstance(value, dict):
+                if isinstance(value, dict) and isinstance(
+                    opts["profiles"][vm_["profile"]][name], dict
+                ):
                     value.update(opts["profiles"][vm_["profile"]][name].copy())
                 else:
                     value = deepcopy(opts["profiles"][vm_["profile"]][name])