From e3c402ada3e05a775fd1d3a71140963c823e499f Mon Sep 17 00:00:00 2001
From: Hiroaki Nakamura <hnakamur@gmail.com>
Date: Fri, 1 Jul 2016 23:23:14 +0900
Subject: [PATCH] Remove debug parameter and add logs in return object when
 invoked with -vvvv

---
 .../modules/extras/cloud/lxd/lxd_container.py     | 15 +++------------
 .../modules/extras/cloud/lxd/lxd_profile.py       | 14 ++------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/lib/ansible/modules/extras/cloud/lxd/lxd_container.py b/lib/ansible/modules/extras/cloud/lxd/lxd_container.py
index fefc7c14170..77fa7bc1402 100644
--- a/lib/ansible/modules/extras/cloud/lxd/lxd_container.py
+++ b/lib/ansible/modules/extras/cloud/lxd/lxd_container.py
@@ -133,12 +133,6 @@ options:
           - If trust_password is set, this module send a request for
             authentication before sending any requests.
         required: false
-    debug:
-        description:
-          - If this flag is true, the logs key are added to the result object
-            which keeps all the requests and responses for calling APIs.
-        required: false
-        default: false
 notes:
   - Containers must have a unique name. If you attempt to create a container
     with a name that already existed in the users namespace the module will
@@ -250,7 +244,7 @@ lxd_container:
       sample: "stopped"
     logs:
       descriptions: The logs of requests and responses.
-      returned: when the debug parameter is true and any requests were sent.
+      returned: when ansible-playbook is invoked with -vvvv.
     actions:
       description: List of actions performed for the container.
       returned: success
@@ -316,7 +310,7 @@ class LXDContainerManagement(object):
         self.url = self.module.params['url']
         self.key_file = self.module.params.get('key_file', None)
         self.cert_file = self.module.params.get('cert_file', None)
-        self.debug = self.module.params['debug']
+        self.debug = self.module._verbosity >= 4
         try:
             self.client = LXDClient(
                 self.url, key_file=self.key_file, cert_file=self.cert_file,
@@ -528,6 +522,7 @@ class LXDContainerManagement(object):
 
             state_changed = len(self.actions) > 0
             result_json = {
+                'log_verbosity': self.module._verbosity,
                 'changed': state_changed,
                 'old_state': self.old_state,
                 'actions': self.actions
@@ -608,10 +603,6 @@ def main():
             ),
             trust_password=dict(
                 type='str',
-            ),
-            debug=dict(
-                type='bool',
-                default=False
             )
         ),
         supports_check_mode=False,
diff --git a/lib/ansible/modules/extras/cloud/lxd/lxd_profile.py b/lib/ansible/modules/extras/cloud/lxd/lxd_profile.py
index 351e280e902..8158a401643 100644
--- a/lib/ansible/modules/extras/cloud/lxd/lxd_profile.py
+++ b/lib/ansible/modules/extras/cloud/lxd/lxd_profile.py
@@ -93,12 +93,6 @@ options:
           - If trust_password is set, this module send a request for
             authentication before sending any requests.
         required: false
-    debug:
-        description:
-          - If this flag is true, the logs key are added to the result object
-            which keeps all the requests and responses for calling APIs.
-        required: false
-        default: false
 notes:
   - Profiles must have a unique name. If you attempt to create a profile
     with a name that already existed in the users namespace the module will
@@ -174,7 +168,7 @@ lxd_profile:
       sample: "absent"
     logs:
       descriptions: The logs of requests and responses.
-      returned: when the debug parameter is true and any requests were sent.
+      returned: when ansible-playbook is invoked with -vvvv.
     actions:
       description: List of actions performed for the profile.
       returned: success
@@ -211,7 +205,7 @@ class LXDProfileManagement(object):
         self.url = self.module.params['url']
         self.key_file = self.module.params.get('key_file', None)
         self.cert_file = self.module.params.get('cert_file', None)
-        self.debug = self.module.params['debug']
+        self.debug = self.module._verbosity >= 4
         try:
             self.client = LXDClient(
                 self.url, key_file=self.key_file, cert_file=self.cert_file,
@@ -371,10 +365,6 @@ def main():
             ),
             trust_password=dict(
                 type='str',
-            ),
-            debug=dict(
-                type='bool',
-                default=False
             )
         ),
         supports_check_mode=False,