From 88488c26ef97857a68bab2330da36cf4b4a8fb10 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Tue, 11 Aug 2015 16:10:49 +0200 Subject: [PATCH] cloudstack: cs_instance: use mutually_exlusive of AnsibleModule --- lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py index 3d43752e419..08c2a0bbb53 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py @@ -402,9 +402,6 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): if not template and not iso: self.module.fail_json(msg="Template or ISO is required.") - if template and iso: - self.module.fail_json(msg="Template are ISO are mutually exclusive.") - args = {} args['account'] = self.get_account(key='name') args['domainid'] = self.get_domain(key='id') @@ -853,6 +850,9 @@ def main(): api_http_method = dict(choices=['get', 'post'], default='get'), api_timeout = dict(type='int', default=10), ), + mutually_exclusive = ( + ['template', 'iso'], + ), required_together = ( ['api_key', 'api_secret', 'api_url'], ),