From 374dd06c8ed8549d39041d9a424b301736582674 Mon Sep 17 00:00:00 2001 From: Tomer Paz <tpaz@users.noreply.github.com> Date: Wed, 11 Feb 2015 09:25:24 +0200 Subject: [PATCH] resolve issue 764 https://github.com/ansible/ansible-modules-core/issues/764 added 'domainname' attribute in addition to existing 'hostname'. That's the most elegant way to delegate domain name to docker-py... --- cloud/docker/docker.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 1957c2d4db0..639c08c0ed0 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -138,6 +138,12 @@ options: required: false default: null aliases: [] + domainname: + description: + - Set container domain name + required: false + default: null + aliases: [] env: description: - Set environment variables (e.g. env="PASSWORD=sEcRe7,WORKERS=4") @@ -724,6 +730,7 @@ class DockerManager(object): 'mem_limit': _human_to_bytes(self.module.params.get('memory_limit')), 'environment': self.env, 'hostname': self.module.params.get('hostname'), + 'domainname': self.module.params.get('domainname'), 'detach': self.module.params.get('detach'), 'name': self.module.params.get('name'), 'stdin_open': self.module.params.get('stdin_open'), @@ -853,6 +860,7 @@ def main(): email = dict(), registry = dict(), hostname = dict(default=None), + domainname = dict(default=None), env = dict(type='dict'), dns = dict(), detach = dict(default=True, type='bool'),