From 8c7ab621c992d522e5e5e3ec724059357bb5d538 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 16 Oct 2017 10:00:15 -0400 Subject: [PATCH] move to use ansible logging (cherry picked from commit 07f1e7540b20b115814bcc07f405a58a8480cc1e) --- lib/ansible/module_utils/k8s_common.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/ansible/module_utils/k8s_common.py b/lib/ansible/module_utils/k8s_common.py index 52887111ac..6de1cc520f 100644 --- a/lib/ansible/module_utils/k8s_common.py +++ b/lib/ansible/module_utils/k8s_common.py @@ -122,10 +122,6 @@ class KubernetesAnsibleModule(AnsibleModule): :return: None """ - if self.params.get('debug'): - self.helper.enable_debug(reset_logfile=False) - self.helper.log_argspec() - resource_definition = self.params.get('resource_definition') if self.params.get('src'): resource_definition = self.load_resource_definition(self.params['src']) @@ -225,10 +221,10 @@ class KubernetesAnsibleModule(AnsibleModule): return_attributes[self.kind] = existing.to_dict() self.exit_json(**return_attributes) else: - self.helper.log('Existing:') - self.helper.log(existing.to_str()) - self.helper.log('\nDifferences:') - self.helper.log(json.dumps(diff, indent=4)) + self.log('Existing:') + self.log(json.dumps(existing.to_str(), indent=4)) + self.log('\nDifferences:') + self.log(json.dumps(diff, indent=4)) # Differences exist between the existing obj and requested params if not self.check_mode: try: @@ -267,7 +263,7 @@ class KubernetesAnsibleModule(AnsibleModule): """ Load the requested src path """ result = None path = os.path.normpath(src) - self.helper.log("Reading definition from {}".format(path)) + self.log("Reading definition from {}".format(path)) if not os.path.exists(path): self.fail_json(msg="Error accessing {}. Does the file exist?".format(path)) try: @@ -290,7 +286,7 @@ class KubernetesAnsibleModule(AnsibleModule): parameters[key] = value elif isinstance(value, dict): self._add_parameter(value, [key], parameters) - self.helper.log("Request to parameters: {}".format(json.dumps(parameters))) + self.log("Request to parameters: {}".format(json.dumps(parameters))) return parameters def _add_parameter(self, request, path, parameters):