Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions library/proxmox_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
import ansible.module_utils.pvesh as pvesh
import re
import json
from json import JSONDecodeError, loads as parse_json
from json import JSONDecodeError, loads as parse_json, dumps as to_json


class ProxmoxStorage(object):
Expand Down Expand Up @@ -355,6 +355,8 @@ def __init__(self, module):
"'backup' content type.")
try:
if self.encryption_key not in ["autogen", None]:
if isinstance(self.encryption_key, dict):
self.encryption_key = to_json(self.encryption_key)
parse_json(self.encryption_key)
except JSONDecodeError:
self.module.fail_json(msg=("encryption_key needs to be valid "
Expand Down Expand Up @@ -578,7 +580,7 @@ def main():
"zfspool", "btrfs", "pbs", "cifs"]),
# Remaining PVE API arguments (depending on type) past this point
datastore=dict(default=None, type='str', required=False),
encryption_key=dict(default=None, type='str', required=False, no_log=True),
encryption_key=dict(default=None, type='raw', required=False, no_log=True),
fingerprint=dict(default=None, type='str', required=False),
master_pubkey=dict(default=None, type='str', required=False),
password=dict(default=None, type='str', required=False, no_log=True),
Expand Down
Loading