Remove debug parameter and add logs in return object when invoked with -vvvv

This commit is contained in:
Hiroaki Nakamura 2016-07-01 23:23:14 +09:00 committed by Matt Clay
commit e3c402ada3
2 changed files with 5 additions and 24 deletions

View file

@ -133,12 +133,6 @@ options:
- If trust_password is set, this module send a request for - If trust_password is set, this module send a request for
authentication before sending any requests. authentication before sending any requests.
required: false 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: notes:
- Containers must have a unique name. If you attempt to create a container - 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 with a name that already existed in the users namespace the module will
@ -250,7 +244,7 @@ lxd_container:
sample: "stopped" sample: "stopped"
logs: logs:
descriptions: The logs of requests and responses. 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: actions:
description: List of actions performed for the container. description: List of actions performed for the container.
returned: success returned: success
@ -316,7 +310,7 @@ class LXDContainerManagement(object):
self.url = self.module.params['url'] self.url = self.module.params['url']
self.key_file = self.module.params.get('key_file', None) self.key_file = self.module.params.get('key_file', None)
self.cert_file = self.module.params.get('cert_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: try:
self.client = LXDClient( self.client = LXDClient(
self.url, key_file=self.key_file, cert_file=self.cert_file, 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 state_changed = len(self.actions) > 0
result_json = { result_json = {
'log_verbosity': self.module._verbosity,
'changed': state_changed, 'changed': state_changed,
'old_state': self.old_state, 'old_state': self.old_state,
'actions': self.actions 'actions': self.actions
@ -608,10 +603,6 @@ def main():
), ),
trust_password=dict( trust_password=dict(
type='str', type='str',
),
debug=dict(
type='bool',
default=False
) )
), ),
supports_check_mode=False, supports_check_mode=False,

View file

@ -93,12 +93,6 @@ options:
- If trust_password is set, this module send a request for - If trust_password is set, this module send a request for
authentication before sending any requests. authentication before sending any requests.
required: false 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: notes:
- Profiles must have a unique name. If you attempt to create a profile - 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 with a name that already existed in the users namespace the module will
@ -174,7 +168,7 @@ lxd_profile:
sample: "absent" sample: "absent"
logs: logs:
descriptions: The logs of requests and responses. 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: actions:
description: List of actions performed for the profile. description: List of actions performed for the profile.
returned: success returned: success
@ -211,7 +205,7 @@ class LXDProfileManagement(object):
self.url = self.module.params['url'] self.url = self.module.params['url']
self.key_file = self.module.params.get('key_file', None) self.key_file = self.module.params.get('key_file', None)
self.cert_file = self.module.params.get('cert_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: try:
self.client = LXDClient( self.client = LXDClient(
self.url, key_file=self.key_file, cert_file=self.cert_file, self.url, key_file=self.key_file, cert_file=self.cert_file,
@ -371,10 +365,6 @@ def main():
), ),
trust_password=dict( trust_password=dict(
type='str', type='str',
),
debug=dict(
type='bool',
default=False
) )
), ),
supports_check_mode=False, supports_check_mode=False,