|
299 | 299 | import ansible.module_utils.pvesh as pvesh
|
300 | 300 | import re
|
301 | 301 | import json
|
302 |
| -from json import JSONDecodeError, loads as parse_json |
| 302 | +from json import JSONDecodeError, dumps as parse_json |
303 | 303 |
|
304 | 304 |
|
305 | 305 | class ProxmoxStorage(object):
|
@@ -355,7 +355,7 @@ def __init__(self, module):
|
355 | 355 | "'backup' content type.")
|
356 | 356 | try:
|
357 | 357 | if self.encryption_key not in ["autogen", None]:
|
358 |
| - parse_json(self.encryption_key) |
| 358 | + self.encryption_key = parse_json(self.encryption_key) |
359 | 359 | except JSONDecodeError:
|
360 | 360 | self.module.fail_json(msg=("encryption_key needs to be valid "
|
361 | 361 | "JSON or set to 'autogen'."))
|
@@ -578,7 +578,7 @@ def main():
|
578 | 578 | "zfspool", "btrfs", "pbs", "cifs"]),
|
579 | 579 | # Remaining PVE API arguments (depending on type) past this point
|
580 | 580 | datastore=dict(default=None, type='str', required=False),
|
581 |
| - encryption_key=dict(default=None, type='str', required=False, no_log=True), |
| 581 | + encryption_key=dict(default=None, type='raw', required=False, no_log=True), |
582 | 582 | fingerprint=dict(default=None, type='str', required=False),
|
583 | 583 | master_pubkey=dict(default=None, type='str', required=False),
|
584 | 584 | password=dict(default=None, type='str', required=False, no_log=True),
|
|
0 commit comments