Merge pull request #1398 from joelthompson/feature/consul_module_tweaks

Add no_log=True to consul modules' API tokens

clustering/consul.py

@@ -523,7 +523,7 @@ def main():
             http=dict(required=False, type='str'),
             timeout=dict(required=False, type='str'),
             tags=dict(required=False, type='list'),
-            token=dict(required=False)
+            token=dict(required=False, no_log=True)
         ),
         supports_check_mode=False,
     )

clustering/consul_acl.py

@@ -313,13 +313,13 @@ def test_dependencies(module):
 
 def main():
     argument_spec = dict(
-        mgmt_token=dict(required=True),
+        mgmt_token=dict(required=True, no_log=True),
         host=dict(default='localhost'),
         name=dict(required=False),
         port=dict(default=8500, type='int'),
         rules=dict(default=None, required=False, type='list'),
         state=dict(default='present', choices=['present', 'absent']),
-        token=dict(required=False),
+        token=dict(required=False, no_log=True),
         token_type=dict(
             required=False, choices=['client', 'management'], default='client')
     )

clustering/consul_kv.py

@@ -241,7 +241,7 @@ def main():
         recurse=dict(required=False, type='bool'),
         retrieve=dict(required=False, default=True),
         state=dict(default='present', choices=['present', 'absent']),
-        token=dict(required=False, default='anonymous'),
+        token=dict(required=False, default='anonymous', no_log=True),
         value=dict(required=False)
     )