From 09e10ea031722f59d34e316b2c3418a4457a747b Mon Sep 17 00:00:00 2001 From: Lorin Hochstein Date: Sat, 27 Dec 2014 22:05:55 -0500 Subject: [PATCH] Don't pass volumes_from to create_container Don't pass the volumes_from argument to the Docker create_container method. If the volumes_from argument is passed to the create_container method, Docker raises the following exception: docker.errors.DockerException: 'volumes_from' parameter has no effect on create_container(). It has been moved to start() --- lib/ansible/modules/cloud/docker/docker.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index ca2e186df1b..0a829670852 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -750,6 +750,7 @@ class DockerManager(object): 'stdin_open': self.module.params.get('stdin_open'), 'tty': self.module.params.get('tty'), 'volumes_from': self.module.params.get('volumes_from'), + 'dns': self.module.params.get('dns'), } if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0: params['volumes_from'] = "" @@ -757,6 +758,11 @@ class DockerManager(object): if params['volumes_from'] is not None: self.ensure_capability('volumes_from') + extra_params = {} + if self.module.params.get('insecure_registry'): + if self.ensure_capability('insecure_registry', fail=False): + extra_params['insecure_registry'] = self.module.params.get('insecure_registry') + def do_create(count, params): results = [] for _ in range(count):