From bef9c081b58f3cb9af4d6bebc92156a049f78765 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Fri, 1 Jan 2016 04:18:19 +0000 Subject: [PATCH] Do not require 'name' when pulling image Change-Id: Iabb08fee7ce0d1b6e5364075bcd5e12255ee83b7 Partially-Implements: blueprint kolla-docker-module --- ansible/library/kolla_docker.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index b2006b4359..32157d3d20 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -366,7 +366,7 @@ def generate_module(): auth_registry=dict(required=False, type='str'), auth_username=dict(required=False, type='str'), detach=dict(required=False, type='bool', default=True), - name=dict(required=True, type='str'), + name=dict(required=False, type='str'), environment=dict(required=False, type='dict'), image=dict(required=False, type='str'), insecure_registry=dict(required=False, type='bool', default=False), @@ -422,6 +422,13 @@ def main(): msg="missing required arguments: image", failed=True ) + # TODO(SamYaple): Replace with required_if when Ansible 2.0 lands + if (module.params.get('action') != 'pull_image' + and not module.params.get('name')): + self.module.fail_json( + msg="missing required arguments: name", + failed=True + ) try: dw = DockerWorker(module)