archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/devel' into devel

Browse Source
reviewable/pr18780/r1
Kristian Koehntopp 9 years ago
parent 0c3926bb75 903d209071
commit 8eb37e7109
17 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
cloud/cloudstack/cs_account.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_affinitygroup.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_domain.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_firewall.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_instance.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_instancegroup.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_ip_address.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_iso.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_network.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_portforward.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_project.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_securitygroup.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_securitygroup_rule.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_sshkeypair.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_staticnat.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_template.py
Unescape Escape View File

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

1
cloud/cloudstack/cs_vmsnapshot.py
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save