diff --git a/cloud/cloudstack/cs_account.py b/cloud/cloudstack/cs_account.py
index dc845acbae2..597e4c7394e 100644
--- a/cloud/cloudstack/cs_account.py
+++ b/cloud/cloudstack/cs_account.py
@@ -108,7 +108,6 @@ local_action:
   email: john.doe@example.com
   domain: CUSTOMERS
 
-
 # Lock an existing account in domain 'CUSTOMERS'
 local_action:
   module: cs_account
@@ -116,7 +115,6 @@ local_action:
   domain: CUSTOMERS
   state: locked
 
-
 # Disable an existing account in domain 'CUSTOMERS'
 local_action:
   module: cs_account
@@ -124,7 +122,6 @@ local_action:
   domain: CUSTOMERS
   state: disabled
 
-
 # Enable an existing account in domain 'CUSTOMERS'
 local_action:
   module: cs_account
@@ -132,7 +129,6 @@ local_action:
   domain: CUSTOMERS
   state: enabled
 
-
 # Remove an account in domain 'CUSTOMERS'
 local_action:
   module: cs_account
@@ -367,7 +363,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_affinitygroup.py b/cloud/cloudstack/cs_affinitygroup.py
index afb60a83baa..40896942cb1 100644
--- a/cloud/cloudstack/cs_affinitygroup.py
+++ b/cloud/cloudstack/cs_affinitygroup.py
@@ -72,7 +72,6 @@ EXAMPLES = '''
     name: haproxy
     affinty_type: host anti-affinity
 
-
 # Remove a affinity group
 - local_action:
     module: cs_affinitygroup
@@ -221,7 +220,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_firewall.py b/cloud/cloudstack/cs_firewall.py
index fca8e88a509..828aa1faf98 100644
--- a/cloud/cloudstack/cs_firewall.py
+++ b/cloud/cloudstack/cs_firewall.py
@@ -115,7 +115,6 @@ EXAMPLES = '''
     port: 80
     cidr: 1.2.3.4/32
 
-
 # Allow inbound tcp/udp port 53 to 4.3.2.1
 - local_action:
     module: cs_firewall
@@ -126,7 +125,6 @@ EXAMPLES = '''
   - tcp
   - udp
 
-
 # Ensure firewall rule is removed
 - local_action:
     module: cs_firewall
@@ -136,7 +134,6 @@ EXAMPLES = '''
     cidr: 17.0.0.0/8
     state: absent
 
-
 # Allow all outbound traffic
 - local_action:
     module: cs_firewall
@@ -144,7 +141,6 @@ EXAMPLES = '''
     type: egress
     protocol: all
 
-
 # Allow only HTTP outbound traffic for an IP
 - local_action:
     module: cs_firewall
@@ -420,7 +416,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_one_of = (
diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py
index b6f2d098346..05cdc960e95 100644
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@@ -800,7 +800,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_instancegroup.py b/cloud/cloudstack/cs_instancegroup.py
index 01630bc225f..396cafa388d 100644
--- a/cloud/cloudstack/cs_instancegroup.py
+++ b/cloud/cloudstack/cs_instancegroup.py
@@ -61,7 +61,6 @@ EXAMPLES = '''
     module: cs_instancegroup
     name: loadbalancers
 
-
 # Remove an instance group
 - local_action:
     module: cs_instancegroup
@@ -198,7 +197,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_iso.py b/cloud/cloudstack/cs_iso.py
index f38faeceeb4..77ce85b505e 100644
--- a/cloud/cloudstack/cs_iso.py
+++ b/cloud/cloudstack/cs_iso.py
@@ -116,7 +116,6 @@ EXAMPLES = '''
     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)
 
-
 # Register an ISO with given name if ISO md5 checksum does not already exist.
 - local_action:
     module: cs_iso
@@ -125,14 +124,12 @@ EXAMPLES = '''
     os_type:    
     checksum: 0b31bccccb048d20b551f70830bb7ad0
 
-
 # Remove an ISO by name
 - local_action:
     module: cs_iso
     name: Debian 7 64-bit
     state: absent
 
-
 # Remove an ISO by checksum
 - local_action:
     module: cs_iso
@@ -331,7 +328,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_portforward.py b/cloud/cloudstack/cs_portforward.py
index e3a456e424b..00b084d9195 100644
--- a/cloud/cloudstack/cs_portforward.py
+++ b/cloud/cloudstack/cs_portforward.py
@@ -402,7 +402,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_securitygroup.py b/cloud/cloudstack/cs_securitygroup.py
index 8f1592ca43a..08fb72c821d 100644
--- a/cloud/cloudstack/cs_securitygroup.py
+++ b/cloud/cloudstack/cs_securitygroup.py
@@ -57,7 +57,6 @@ EXAMPLES = '''
     name: default
     description: default security group
 
-
 # Remove a security group
 - local_action:
     module: cs_securitygroup
@@ -165,7 +164,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_securitygroup_rule.py b/cloud/cloudstack/cs_securitygroup_rule.py
index 7afb1463503..9252e06ce62 100644
--- a/cloud/cloudstack/cs_securitygroup_rule.py
+++ b/cloud/cloudstack/cs_securitygroup_rule.py
@@ -102,7 +102,6 @@ EXAMPLES = '''
     port: 80
     cidr: 1.2.3.4/32
 
-
 # Allow tcp/udp outbound added to security group 'default'
 - local_action:
     module: cs_securitygroup_rule
@@ -115,7 +114,6 @@ EXAMPLES = '''
   - tcp
   - udp
 
-
 # Allow inbound icmp from 0.0.0.0/0 added to security group 'default'
 - local_action:
     module: cs_securitygroup_rule
@@ -124,7 +122,6 @@ EXAMPLES = '''
     icmp_code: -1
     icmp_type: -1
 
-
 # Remove rule inbound port 80/tcp from 0.0.0.0/0 from security group 'default'
 - local_action:
     module: cs_securitygroup_rule
@@ -132,7 +129,6 @@ EXAMPLES = '''
     port: 80
     state: absent
 
-
 # Allow inbound port 80/tcp from security group web added to security group 'default'
 - local_action:
     module: cs_securitygroup_rule
@@ -400,7 +396,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_sshkeypair.py b/cloud/cloudstack/cs_sshkeypair.py
index b4b764dbe33..0a54a1971bc 100644
--- a/cloud/cloudstack/cs_sshkeypair.py
+++ b/cloud/cloudstack/cs_sshkeypair.py
@@ -217,7 +217,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (
diff --git a/cloud/cloudstack/cs_vmsnapshot.py b/cloud/cloudstack/cs_vmsnapshot.py
index 218a947ac5a..fb7668640dc 100644
--- a/cloud/cloudstack/cs_vmsnapshot.py
+++ b/cloud/cloudstack/cs_vmsnapshot.py
@@ -88,7 +88,6 @@ EXAMPLES = '''
     vm: web-01
     snapshot_memory: yes
 
-
 # Revert a VM to a snapshot after a failed upgrade
 - local_action:
     module: cs_vmsnapshot
@@ -96,7 +95,6 @@ EXAMPLES = '''
     vm: web-01
     state: revert
 
-
 # Remove a VM snapshot after successful upgrade
 - local_action:
     module: cs_vmsnapshot
@@ -290,7 +288,7 @@ def main():
             api_key = dict(default=None),
             api_secret = dict(default=None, no_log=True),
             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),
         ),
         required_together = (