diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2015-02-11 07:29:05 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2015-02-11 07:29:05 -0800 |
| commit | 5165ff4e152404d933b5f6d56c1da1b918aebb1d (patch) | |
| tree | 6145c86105c5c6fa5474e6894b430aa8d4c19d45 | |
| parent | e36db27f746218a9163d07864699281388f93529 (diff) | |
| parent | 374dd06c8ed8549d39041d9a424b301736582674 (diff) | |
| download | ansible-modules-core-5165ff4e152404d933b5f6d56c1da1b918aebb1d.tar.gz | |
Merge pull request #769 from tpaz/devel
resolve issue 764
| -rw-r--r-- | cloud/docker/docker.py | 8 |
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'), |