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

docker_image: fix module failing when build option is used without specifying path (#56940)

Browse source 
* Fix module failing when build option is used without specifying path.

* Add changelog.
This commit is contained in:
Felix Fontein 2019-05-28 20:48:08 +02:00 committed by GitHub
parent 56e2d48612
commit 86928a5f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56940-docker_image-fail.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_image - module failed when ``source: build`` was set but ``build.path`` options not specified."

2
lib/ansible/modules/cloud/docker/docker_image.py
View file

@ -886,7 +886,7 @@ def main():
'has been renamed and will be removed in Ansible 2.12.' % (build_option, option, option))
if client.module.params['source'] == 'build':
if (not client.module.params['build'] or not client.module.params['build'].get('path')):
client.module.fail('If "source" is set to "build", the "build.path" option must be specified.')
client.fail('If "source" is set to "build", the "build.path" option must be specified.')
if client.module.params['build'].get('pull') is None:
client.module.warn("The default for build.pull is currently 'yes', but will be changed to 'no' in Ansible 2.12. "
"Please set build.pull explicitly to the value you need.")