cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Fixes #26690] Supports Python 3 handling of base64 encoding (#26876)

Browse source 
* [Fixes #26690] Supports Python 3 handling of base64 encoding

* Set text auth to separate variable for reuse
This commit is contained in:
Will Medlar 2017-07-17 23:11:52 -05:00 committed by Toshio Kuratomi
parent 42ca1ef040
commit 3f67d167fe
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/docker/docker_login.py
View file

@ -143,6 +143,7 @@ login_results:
import base64
from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils.docker_common import *
@ -276,8 +277,13 @@ class LoginManager(DockerBaseClass):
self.log("Adding registry_url %s to auths." % (self.registry_url))
config['auths'][self.registry_url] = dict()
b64auth = base64.b64encode(
to_bytes(self.username) + b':' + to_bytes(self.password)
)
auth = to_text(b64auth)
encoded_credentials = dict(
auth=base64.b64encode(self.username + b':' + self.password),
auth=auth,
email=self.email
)