summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Paz <tpaz@users.noreply.github.com>2015-02-11 09:25:24 +0200
committerTomer Paz <tpaz@users.noreply.github.com>2015-02-11 09:25:24 +0200
commit374dd06c8ed8549d39041d9a424b301736582674 (patch)
tree9c47e2a965f26877963a69132a1a53c26902ea16
parentfdda25691c13ba61b67aa352fb02433f0d9fcd48 (diff)
downloadansible-modules-core-374dd06c8ed8549d39041d9a424b301736582674.tar.gz
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...
-rw-r--r--cloud/docker/docker.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index 1957c2d4..639c08c0 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'),