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

resolve issue 764

Browse source 
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...
This commit is contained in:
Tomer Paz 2015-02-11 09:25:24 +02:00 committed by Matt Clay
parent 5f24584010
commit 76ee9a6a04
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,6 +138,12 @@ options:
required: false required: false
default: null default: null
aliases: [] aliases: []
domainname:
description:
- Set container domain name
required: false
default: null
aliases: []
env: env:
description: description:
- Set environment variables (e.g. env="PASSWORD=sEcRe7,WORKERS=4") - 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')), 'mem_limit': _human_to_bytes(self.module.params.get('memory_limit')),
'environment': self.env, 'environment': self.env,
'hostname': self.module.params.get('hostname'), 'hostname': self.module.params.get('hostname'),
'domainname': self.module.params.get('domainname'),
'detach': self.module.params.get('detach'), 'detach': self.module.params.get('detach'),
'name': self.module.params.get('name'), 'name': self.module.params.get('name'),
'stdin_open': self.module.params.get('stdin_open'), 'stdin_open': self.module.params.get('stdin_open'),
@ -853,6 +860,7 @@ def main():
email = dict(), email = dict(),
registry = dict(), registry = dict(),
hostname = dict(default=None), hostname = dict(default=None),
domainname = dict(default=None),
env = dict(type='dict'), env = dict(type='dict'),
dns = dict(), dns = dict(),
detach = dict(default=True, type='bool'), detach = dict(default=True, type='bool'),