From 89e8787d65744bf42cce634e98b0d5dbabd8055f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodr=C3=ADguez=2C=20Jorge?= Date: Wed, 8 Jun 2016 11:31:46 +0300 Subject: [PATCH] Don't forcibly push loaded images to registry. Fixes #3763 --- lib/ansible/modules/cloud/docker/docker_image.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_image.py b/lib/ansible/modules/cloud/docker/docker_image.py index 309d92a328f..e900eef6334 100644 --- a/lib/ansible/modules/cloud/docker/docker_image.py +++ b/lib/ansible/modules/cloud/docker/docker_image.py @@ -191,11 +191,12 @@ EXAMPLES = ''' name: registry.ansible.com/chouseknecht/sinatra tag: v1 load_path: my_sinatra.tar + push: True ''' RETURN = ''' image: - description: Image inspection results for the affected image. + description: Image inspection results for the affected image. returned: success type: complex sample: {} @@ -236,7 +237,7 @@ class ImageManager(DockerBaseClass): self.state = parameters.get('state') self.tag = parameters.get('tag') self.http_timeout = parameters.get('http_timeout') - self.debug = parameters.get('debug') + self.debug = parameters.get('debug') self.push = False if self.state in ['present', 'build']: @@ -275,7 +276,6 @@ class ImageManager(DockerBaseClass): if not os.path.isfile(self.load_path): self.fail("Error loading image %s. Specified path %s does not exist." % (self.name, self.load_path)) - self.push = True image_name = self.name if self.tag: image_name = "%s:%s" % (self.name, self.tag)