Merge pull request #6934 from vrutkovs/docker_creds-write-decode

Automatic merge from submit-queue.

docker_creds: decode docker_config for py3 only if its a string

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539552

1 files changed, 3 insertions, 1 deletions

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,