From 5a7a5b88c9364f88326bba2375e8c1bd8dd09c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Moser?= <mail@renemoser.net>
Date: Sun, 14 Jan 2018 14:20:26 +0100
Subject: [PATCH] vultr: fix config ini params ignored (#34848)

* vultr: fix config ini params ignored

* vutlr: align docs with configs
---
 lib/ansible/module_utils/vultr.py                | 8 ++++----
 lib/ansible/utils/module_docs_fragments/vultr.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ansible/module_utils/vultr.py b/lib/ansible/module_utils/vultr.py
index d735af90c54..9085ed2b26c 100644
--- a/lib/ansible/module_utils/vultr.py
+++ b/lib/ansible/module_utils/vultr.py
@@ -19,8 +19,8 @@ VULTR_API_ENDPOINT = "https://api.vultr.com"
 def vultr_argument_spec():
     return dict(
         api_key=dict(default=os.environ.get('VULTR_API_KEY'), no_log=True),
-        api_timeout=dict(type='int', default=os.environ.get('VULTR_API_TIMEOUT') or 60),
-        api_retries=dict(type='int', default=os.environ.get('VULTR_API_RETRIES') or 5),
+        api_timeout=dict(type='int', default=os.environ.get('VULTR_API_TIMEOUT')),
+        api_retries=dict(type='int', default=os.environ.get('VULTR_API_RETRIES')),
         api_account=dict(default=os.environ.get('VULTR_API_ACCOUNT') or 'default'),
         validate_certs=dict(default=True, type='bool'),
     )
@@ -50,8 +50,8 @@ class Vultr:
 
         self.api_config = {
             'api_key': self.module.params.get('api_key') or config.get('key'),
-            'api_timeout': self.module.params.get('api_timeout') or config.get('timeout'),
-            'api_retries': self.module.params.get('api_retries') or config.get('retries'),
+            'api_timeout': self.module.params.get('api_timeout') or config.get('timeout') or 60,
+            'api_retries': self.module.params.get('api_retries') or config.get('retries') or 5,
         }
 
         # Common vultr returns
diff --git a/lib/ansible/utils/module_docs_fragments/vultr.py b/lib/ansible/utils/module_docs_fragments/vultr.py
index c544a8881ab..5e1a6f47229 100644
--- a/lib/ansible/utils/module_docs_fragments/vultr.py
+++ b/lib/ansible/utils/module_docs_fragments/vultr.py
@@ -16,12 +16,12 @@ options:
     description:
       - HTTP timeout to Vultr API.
       - The ENV variable C(VULTR_API_TIMEOUT) is used as default, when defined.
-    default: 10
+    default: 60
   api_retries:
     description:
       - Amount of retries in case of the Vultr API retuns an HTTP 503 code.
       - The ENV variable C(VULTR_API_RETRIES) is used as default, when defined.
-    default: 10
+    default: 5
   api_account:
     description:
       - Name of the ini section in the C(vultr.ini) file.
@@ -30,7 +30,7 @@ options:
   validate_certs:
     description:
       - Validate SSL certs of the Vultr API.
-    default: true
+    default: yes
     type: bool
 requirements:
   - "python >= 2.6"