wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework change detection

Browse source
This commit is contained in:
Olaf Kilian 2015-10-28 10:13:35 +01:00 committed by Matt Clay
parent 348cab4511
commit b826aa6b35
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/extras/cloud/docker/docker_login.py
View file

@ -162,13 +162,9 @@ class DockerLoginManager:
# Get status from registry response. # Get status from registry response.
if self.response.has_key("Status"): if self.response.has_key("Status"):
self.log.append(self.response["Status"]) self.log.append(self.response["Status"])
if self.response["Status"] == "Login Succeeded":
self.changed = True
else:
self.log.append("Already Authentificated")
# Update the dockercfg if changed but not failed. # Update the dockercfg if not in check mode.
if self.has_changed() and not self.module.check_mode: if not self.module.check_mode:
self.update_dockercfg() self.update_dockercfg()
# This is what the underlaying docker-py unfortunately doesn't do (yet). # This is what the underlaying docker-py unfortunately doesn't do (yet).
@ -182,9 +178,9 @@ class DockerLoginManager:
open(self.dockercfg_path, "w") open(self.dockercfg_path, "w")
self.log.append("Created new Docker config file at %s" % self.dockercfg_path) self.log.append("Created new Docker config file at %s" % self.dockercfg_path)
else: else:
self.log.append("Updated existing Docker config file at %s" % self.dockercfg_path) self.log.append("Found existing Docker config file at %s" % self.dockercfg_path)
# Get existing dockercfg into a dict. # Build a dict for the existing dockercfg.
try: try:
docker_config = json.load(open(self.dockercfg_path, "r")) docker_config = json.load(open(self.dockercfg_path, "r"))
except ValueError: except ValueError:
@ -193,16 +189,22 @@ class DockerLoginManager:
docker_config["auths"] = dict() docker_config["auths"] = dict()
if not docker_config["auths"].has_key(self.registry): if not docker_config["auths"].has_key(self.registry):
docker_config["auths"][self.registry] = dict() docker_config["auths"][self.registry] = dict()
docker_config["auths"][self.registry] = dict(
# Calculate docker credentials based on current parameters.
new_docker_config = dict(
auth = base64.b64encode(self.username + b':' + self.password), auth = base64.b64encode(self.username + b':' + self.password),
email = self.email email = self.email
) )
# Write updated dockercfg to dockercfg file. # Update config if persisted credentials differ from current credentials.
if new_docker_config != docker_config["auths"][self.registry]:
docker_config["auths"][self.registry] = new_docker_config
try: try:
json.dump(docker_config, open(self.dockercfg_path, "w"), indent=4, sort_keys=True) json.dump(docker_config, open(self.dockercfg_path, "w"), indent=4, sort_keys=True)
except Exception as e: except Exception as e:
self.module.fail_json(msg="failed to write auth details to file", error=repr(e)) self.module.fail_json(msg="failed to write auth details to file", error=repr(e))
self.log.append("Updated Docker config with new credentials.")
self.changed = True
# Compatible to docker-py auth.decode_docker_auth() # Compatible to docker-py auth.decode_docker_auth()
def encode_docker_auth(self, auth): def encode_docker_auth(self, auth):