Merge pull request #896 from resmo/for-ansible

cloudstack: add api_region arg
This commit is contained in:
Toshio Kuratomi 2015-09-03 13:00:05 -07:00
commit 903d209071
17 changed files with 17 additions and 0 deletions

View file

@ -366,6 +366,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -215,6 +215,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -251,6 +251,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -413,6 +413,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_one_of = ( required_one_of = (
['ip_address', 'network'], ['ip_address', 'network'],

View file

@ -825,6 +825,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
mutually_exclusive = ( mutually_exclusive = (
['template', 'iso'], ['template', 'iso'],

View file

@ -182,6 +182,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -239,6 +239,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -316,6 +316,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -552,6 +552,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -390,6 +390,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -272,6 +272,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -163,6 +163,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -390,6 +390,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['icmp_type', 'icmp_code'], ['icmp_type', 'icmp_code'],

View file

@ -218,6 +218,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -275,6 +275,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['api_key', 'api_secret', 'api_url'], ['api_key', 'api_secret', 'api_url'],

View file

@ -565,6 +565,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
mutually_exclusive = ( mutually_exclusive = (
['url', 'vm'], ['url', 'vm'],

View file

@ -274,6 +274,7 @@ def main():
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(choices=['get', 'post'], default='get'), api_http_method = dict(choices=['get', 'post'], default='get'),
api_timeout = dict(type='int', default=10), api_timeout = dict(type='int', default=10),
api_region = dict(default='cloudstack'),
), ),
required_together = ( required_together = (
['icmp_type', 'icmp_code'], ['icmp_type', 'icmp_code'],