From eee420c9fc74e60759dc97adf96c4209240d49b4 Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Mon, 5 Dec 2016 16:22:17 +0000 Subject: Conditional main - monitoring (#3648) --- monitoring/airbrake_deployment.py | 4 ++-- monitoring/logentries.py | 3 ++- monitoring/monit.py | 3 ++- monitoring/nagios.py | 4 +++- monitoring/newrelic_deployment.py | 4 ++-- monitoring/pagerduty.py | 3 ++- monitoring/pingdom.py | 4 +++- monitoring/sensu_check.py | 4 +++- monitoring/zabbix_group.py | 4 +++- monitoring/zabbix_host.py | 4 +++- monitoring/zabbix_hostmacro.py | 3 ++- monitoring/zabbix_maintenance.py | 4 +++- 12 files changed, 30 insertions(+), 14 deletions(-) (limited to 'monitoring') diff --git a/monitoring/airbrake_deployment.py b/monitoring/airbrake_deployment.py index 282d4c60..d6daec2c 100644 --- a/monitoring/airbrake_deployment.py +++ b/monitoring/airbrake_deployment.py @@ -128,5 +128,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * -main() - +if __name__ == '__main__': + main() diff --git a/monitoring/logentries.py b/monitoring/logentries.py index f4e3fef3..c772b6a1 100644 --- a/monitoring/logentries.py +++ b/monitoring/logentries.py @@ -152,4 +152,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/monitoring/monit.py b/monitoring/monit.py index eafa3e02..f7c46b86 100644 --- a/monitoring/monit.py +++ b/monitoring/monit.py @@ -184,4 +184,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/monitoring/nagios.py b/monitoring/nagios.py index cb7b1ae5..b14d03e9 100644 --- a/monitoring/nagios.py +++ b/monitoring/nagios.py @@ -1078,4 +1078,6 @@ class Nagios(object): ###################################################################### # import module snippets from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/monitoring/newrelic_deployment.py b/monitoring/newrelic_deployment.py index 6224fbf4..4d47169e 100644 --- a/monitoring/newrelic_deployment.py +++ b/monitoring/newrelic_deployment.py @@ -144,5 +144,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * -main() - +if __name__ == '__main__': + main() diff --git a/monitoring/pagerduty.py b/monitoring/pagerduty.py index 43b2af94..a6d6da7d 100644 --- a/monitoring/pagerduty.py +++ b/monitoring/pagerduty.py @@ -307,4 +307,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * -main() +if __name__ == '__main__': + main() diff --git a/monitoring/pingdom.py b/monitoring/pingdom.py index 6709c6bc..8b719e48 100644 --- a/monitoring/pingdom.py +++ b/monitoring/pingdom.py @@ -151,4 +151,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/monitoring/sensu_check.py b/monitoring/sensu_check.py index 6ded2aae..9acbfefa 100644 --- a/monitoring/sensu_check.py +++ b/monitoring/sensu_check.py @@ -393,4 +393,6 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.pycompat24 import get_exception -main() + +if __name__ == '__main__': + main() diff --git a/monitoring/zabbix_group.py b/monitoring/zabbix_group.py index ec1f65ed..2dd8d983 100644 --- a/monitoring/zabbix_group.py +++ b/monitoring/zabbix_group.py @@ -222,4 +222,6 @@ def main(): module.exit_json(changed=False) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/monitoring/zabbix_host.py b/monitoring/zabbix_host.py index 34b68c78..611a5f9f 100644 --- a/monitoring/zabbix_host.py +++ b/monitoring/zabbix_host.py @@ -574,4 +574,6 @@ def main(): host_name, ip, link_templates)) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/monitoring/zabbix_hostmacro.py b/monitoring/zabbix_hostmacro.py index c02f9b6e..446f658b 100644 --- a/monitoring/zabbix_hostmacro.py +++ b/monitoring/zabbix_hostmacro.py @@ -239,5 +239,6 @@ def main(): host_macro_class_obj.update_host_macro(host_macro_obj, macro_name, macro_value) from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/monitoring/zabbix_maintenance.py b/monitoring/zabbix_maintenance.py index 247b0a8e..7fe0a494 100644 --- a/monitoring/zabbix_maintenance.py +++ b/monitoring/zabbix_maintenance.py @@ -382,4 +382,6 @@ def main(): module.exit_json(changed=changed) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() -- cgit v1.2.1