diff options
| author | Chris Houseknecht <chousekn@redhat.com> | 2017-03-10 23:46:07 -0500 |
|---|---|---|
| committer | Brian Coca <bcoca@users.noreply.github.com> | 2017-03-13 14:39:23 -0400 |
| commit | b15ceee6bd5c7b5db986808b5cb93f1b53ef9641 (patch) | |
| tree | 553fe24c763570b221ea927f42b12ddb6c3599a5 | |
| parent | 4cc872669c065bf995b6d8729e4d5ca9164fa332 (diff) | |
| download | ansible-b15ceee6bd5c7b5db986808b5cb93f1b53ef9641.tar.gz | |
Changes command and entrypoint to type list
| -rw-r--r-- | lib/ansible/modules/cloud/docker/docker_container.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py index 8d2239f59a..c0fc651c3c 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -574,7 +574,7 @@ EXAMPLES = ''' docker_container: name: sleepy image: ubuntu:14.04 - command: sleep infinity + command: ["sleep", "infinity"] - name: Add container to networks docker_container: @@ -801,6 +801,14 @@ class TaskParameters(DockerBaseClass): if network.get('links'): network['links'] = self._parse_links(network['links']) + if self.entrypoint: + # convert from list to str. + self.entrypoint = ' '.join([str(x) for x in self.entrypoint]) + + if self.command: + # convert from list to str + self.command = ' '.join([str(x) for x in self.command]) + def fail(self, msg): self.client.module.fail_json(msg=msg) @@ -1483,7 +1491,6 @@ class Container(DockerBaseClass): return expected_devices def _get_expected_entrypoint(self): - self.log('_get_expected_entrypoint') if not self.parameters.entrypoint: return None return shlex.split(self.parameters.entrypoint) @@ -1940,7 +1947,7 @@ def main(): blkio_weight=dict(type='int'), capabilities=dict(type='list'), cleanup=dict(type='bool', default=False), - command=dict(type='str'), + command=dict(type='list'), cpu_period=dict(type='int'), cpu_quota=dict(type='int'), cpuset_cpus=dict(type='str'), @@ -1953,7 +1960,7 @@ def main(): dns_search_domains=dict(type='list'), env=dict(type='dict'), env_file=dict(type='path'), - entrypoint=dict(type='str'), + entrypoint=dict(type='list'), etc_hosts=dict(type='dict'), exposed_ports=dict(type='list', aliases=['exposed', 'expose']), force_kill=dict(type='bool', default=False, aliases=['forcekill']), |