openstack
/
monasca-notification
Code Issues Proposed changes

Insecure and verify were being treated equally 

Change-Id: I64bc34e3c2e22352990a7f456baedf191688724f
This commit is contained in:
Michael James Hoppal 2017-04-13 13:39:49 -06:00
parent 0708971544
commit 674cdfb707
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monasca_notification/plugins/hipchat_notifier.py
View File

@ -1,4 +1,4 @@
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -95,7 +95,7 @@ class HipChatNotifier(abstract_notifier.AbstractNotifier):
url = urlparse.urljoin(notification.address, urlparse.urlparse(notification.address).path)
# Default option is to do cert verification
verify = self._config.get('insecure', False)
verify = not self._config.get('insecure', True)
# If ca_certs is specified, do cert validation and ignore insecure flag
if (self._config.get("ca_certs")):
verify = self._config.get("ca_certs")

4
monasca_notification/plugins/slack_notifier.py
View File

@ -1,4 +1,4 @@
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -83,7 +83,7 @@ class SlackNotifier(abstract_notifier.AbstractNotifier):
url = urlparse.urljoin(address, urlparse.urlparse(address).path)
# Default option is to do cert verification
verify = self._config.get('insecure', False)
verify = not self._config.get('insecure', True)
# If ca_certs is specified, do cert validation and ignore insecure flag
if (self._config.get("ca_certs")):
verify = self._config.get("ca_certs")