diff options
| author | SamYaple <sam@yaple.net> | 2016-01-01 04:18:19 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-01-03 16:49:59 +0000 |
| commit | bef9c081b58f3cb9af4d6bebc92156a049f78765 (patch) | |
| tree | cf1e70c04ec97e1b0201faa3af2e0bd8803afaea | |
| parent | 912ecd0dfc5be0eb152d33b375ce13c9df126f02 (diff) | |
| download | kolla-bef9c081b58f3cb9af4d6bebc92156a049f78765.tar.gz kolla-bef9c081b58f3cb9af4d6bebc92156a049f78765.zip | |
Do not require 'name' when pulling image
Change-Id: Iabb08fee7ce0d1b6e5364075bcd5e12255ee83b7
Partially-Implements: blueprint kolla-docker-module
| -rw-r--r-- | ansible/library/kolla_docker.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index b2006b435..32157d3d2 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) |