From d7741d8bc0f0f320cb061bf63bcd2629b5e583a9 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 30 Jan 2018 12:32:52 +0100 Subject: docker_creds: decode docker_config for py3 only if its a string --- roles/lib_utils/library/docker_creds.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roles/lib_utils') diff --git a/roles/lib_utils/library/docker_creds.py b/roles/lib_utils/library/docker_creds.py index b94c0b779..936fb1c38 100644 --- a/roles/lib_utils/library/docker_creds.py +++ b/roles/lib_utils/library/docker_creds.py @@ -148,10 +148,12 @@ def update_config(docker_config, registry, username, password): def write_config(module, docker_config, dest): '''Write updated credentials into dest/config.json''' + if not isinstance(docker_config, dict): + docker_config = docker_config.decode() conf_file_path = os.path.join(dest, 'config.json') try: with open(conf_file_path, 'w') as conf_file: - json.dump(docker_config.decode(), conf_file, indent=8) + json.dump(docker_config, conf_file, indent=8) except IOError as ioerror: result = {'failed': True, 'changed': False, -- cgit v1.2.1