cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cloudstack: add choices for api_http_method

Browse source
This commit is contained in:
Rene Moser 2015-05-30 11:05:03 +02:00 committed by Matt Clay
parent 2ca6d151b2
commit b30fda4906
11 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
View file

@ -108,7 +108,6 @@ local_action:
email: john.doe@example.com email: john.doe@example.com
domain: CUSTOMERS domain: CUSTOMERS
# Lock an existing account in domain 'CUSTOMERS' # Lock an existing account in domain 'CUSTOMERS'
local_action: local_action:
module: cs_account module: cs_account
@ -116,7 +115,6 @@ local_action:
domain: CUSTOMERS domain: CUSTOMERS
state: locked state: locked
# Disable an existing account in domain 'CUSTOMERS' # Disable an existing account in domain 'CUSTOMERS'
local_action: local_action:
module: cs_account module: cs_account
@ -124,7 +122,6 @@ local_action:
domain: CUSTOMERS domain: CUSTOMERS
state: disabled state: disabled
# Enable an existing account in domain 'CUSTOMERS' # Enable an existing account in domain 'CUSTOMERS'
local_action: local_action:
module: cs_account module: cs_account
@ -132,7 +129,6 @@ local_action:
domain: CUSTOMERS domain: CUSTOMERS
state: enabled state: enabled
# Remove an account in domain 'CUSTOMERS' # Remove an account in domain 'CUSTOMERS'
local_action: local_action:
module: cs_account module: cs_account
@ -367,7 +363,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

3
lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py
View file

@ -71,7 +71,6 @@ EXAMPLES = '''
name: haproxy name: haproxy
affinty_type: host anti-affinity affinty_type: host anti-affinity
# Remove a affinity group # Remove a affinity group
- local_action: - local_action:
module: cs_affinitygroup module: cs_affinitygroup
@ -220,7 +219,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

6
lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py
View file

@ -114,7 +114,6 @@ EXAMPLES = '''
port: 80 port: 80
cidr: 1.2.3.4/32 cidr: 1.2.3.4/32
# Allow inbound tcp/udp port 53 to 4.3.2.1 # Allow inbound tcp/udp port 53 to 4.3.2.1
- local_action: - local_action:
module: cs_firewall module: cs_firewall
@ -125,7 +124,6 @@ EXAMPLES = '''
- tcp - tcp
- udp - udp
# Ensure firewall rule is removed # Ensure firewall rule is removed
- local_action: - local_action:
module: cs_firewall module: cs_firewall
@ -135,7 +133,6 @@ EXAMPLES = '''
cidr: 17.0.0.0/8 cidr: 17.0.0.0/8
state: absent state: absent
# Allow all outbound traffic # Allow all outbound traffic
- local_action: - local_action:
module: cs_firewall module: cs_firewall
@ -143,7 +140,6 @@ EXAMPLES = '''
type: egress type: egress
protocol: all protocol: all
# Allow only HTTP outbound traffic for an IP # Allow only HTTP outbound traffic for an IP
- local_action: - local_action:
module: cs_firewall module: cs_firewall
@ -419,7 +415,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_one_of = ( required_one_of = (

2
lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
View file

@ -800,7 +800,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

3
lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py
View file

@ -61,7 +61,6 @@ EXAMPLES = '''
module: cs_instancegroup module: cs_instancegroup
name: loadbalancers name: loadbalancers
# Remove an instance group # Remove an instance group
- local_action: - local_action:
module: cs_instancegroup module: cs_instancegroup
@ -198,7 +197,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

5
lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py
View file

@ -115,7 +115,6 @@ EXAMPLES = '''
url: http://mirror.switch.ch/ftp/mirror/debian-cd/current/amd64/iso-cd/debian-7.7.0-amd64-netinst.iso url: http://mirror.switch.ch/ftp/mirror/debian-cd/current/amd64/iso-cd/debian-7.7.0-amd64-netinst.iso
os_type: Debian GNU/Linux 7(64-bit) os_type: Debian GNU/Linux 7(64-bit)
# Register an ISO with given name if ISO md5 checksum does not already exist. # Register an ISO with given name if ISO md5 checksum does not already exist.
- local_action: - local_action:
module: cs_iso module: cs_iso
@ -124,14 +123,12 @@ EXAMPLES = '''
os_type: os_type:
checksum: 0b31bccccb048d20b551f70830bb7ad0 checksum: 0b31bccccb048d20b551f70830bb7ad0
# Remove an ISO by name # Remove an ISO by name
- local_action: - local_action:
module: cs_iso module: cs_iso
name: Debian 7 64-bit name: Debian 7 64-bit
state: absent state: absent
# Remove an ISO by checksum # Remove an ISO by checksum
- local_action: - local_action:
module: cs_iso module: cs_iso
@ -330,7 +327,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

2
lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py
View file

@ -402,7 +402,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

3
lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py
View file

@ -55,7 +55,6 @@ EXAMPLES = '''
name: default name: default
description: default security group description: default security group
# Remove a security group # Remove a security group
- local_action: - local_action:
module: cs_securitygroup module: cs_securitygroup
@ -163,7 +162,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

6
lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py
View file

@ -101,7 +101,6 @@ EXAMPLES = '''
port: 80 port: 80
cidr: 1.2.3.4/32 cidr: 1.2.3.4/32
# Allow tcp/udp outbound added to security group 'default' # Allow tcp/udp outbound added to security group 'default'
- local_action: - local_action:
module: cs_securitygroup_rule module: cs_securitygroup_rule
@ -114,7 +113,6 @@ EXAMPLES = '''
- tcp - tcp
- udp - udp
# Allow inbound icmp from 0.0.0.0/0 added to security group 'default' # Allow inbound icmp from 0.0.0.0/0 added to security group 'default'
- local_action: - local_action:
module: cs_securitygroup_rule module: cs_securitygroup_rule
@ -123,7 +121,6 @@ EXAMPLES = '''
icmp_code: -1 icmp_code: -1
icmp_type: -1 icmp_type: -1
# Remove rule inbound port 80/tcp from 0.0.0.0/0 from security group 'default' # Remove rule inbound port 80/tcp from 0.0.0.0/0 from security group 'default'
- local_action: - local_action:
module: cs_securitygroup_rule module: cs_securitygroup_rule
@ -131,7 +128,6 @@ EXAMPLES = '''
port: 80 port: 80
state: absent state: absent
# Allow inbound port 80/tcp from security group web added to security group 'default' # Allow inbound port 80/tcp from security group web added to security group 'default'
- local_action: - local_action:
module: cs_securitygroup_rule module: cs_securitygroup_rule
@ -399,7 +395,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

2
lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py
View file

@ -217,7 +217,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (

4
lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py
View file

@ -87,7 +87,6 @@ EXAMPLES = '''
vm: web-01 vm: web-01
snapshot_memory: yes snapshot_memory: yes
# Revert a VM to a snapshot after a failed upgrade # Revert a VM to a snapshot after a failed upgrade
- local_action: - local_action:
module: cs_vmsnapshot module: cs_vmsnapshot
@ -95,7 +94,6 @@ EXAMPLES = '''
vm: web-01 vm: web-01
state: revert state: revert
# Remove a VM snapshot after successful upgrade # Remove a VM snapshot after successful upgrade
- local_action: - local_action:
module: cs_vmsnapshot module: cs_vmsnapshot
@ -289,7 +287,7 @@ def main():
api_key = dict(default=None), api_key = dict(default=None),
api_secret = dict(default=None, no_log=True), api_secret = dict(default=None, no_log=True),
api_url = dict(default=None), api_url = dict(default=None),
api_http_method = dict(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),
), ),
required_together = ( required_together = (