Backport/2.8/57617 (#57756)
* kubevirt_pvc: fix parameter priority (#57617) * Add changelog * Drop superfluous dict() Co-Authored-By: Toshio Kuratomi <a.badger@gmail.com>
This commit is contained in:
parent
36df5d22a4
commit
b41bbd9564
2 changed files with 2 additions and 1 deletions
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
bugfixes:
|
||||
- Properly handle data importer failures on PVC creation, instead of timing out.
|
||||
- kubevirt_pvc – fix regression breaking any CDI features.
|
||||
|
|
|
@ -437,7 +437,7 @@ class KubevirtPVC(KubernetesRawModule):
|
|||
spec['volumeName'] = self.params.get('volume_name')
|
||||
|
||||
# 'resource_definition:' has lower priority than module parameters
|
||||
definition = KubeVirtRawModule.merge_dicts(self.resource_definitions[0], definition)
|
||||
definition = KubeVirtRawModule.merge_dicts(definition, self.resource_definitions[0])
|
||||
|
||||
self.client = self.get_api_client()
|
||||
resource = self.find_resource(KIND, API, fail=True)
|
||||
|
|
Loading…
Reference in a new issue