summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Thompson <mattt@defunct.ca>2017-06-23 10:54:36 -0400
committerMatt Thompson <mattt@defunct.ca>2017-06-23 12:24:11 -0400
commitd99b674500fc654cc7f9e076124a0a294064bc6a (patch)
tree35c8d8ff6975f86efe9a78a662e152a022ee8688
parentf6557612121f4c416c99b1dc86321877009d6328 (diff)
Default insecure to false in sample config
In PR [1] the default for insecure was set to False. This commit updates the sample configuration file to match that default. NOTE: We also mock out test_insecure as is done in test_secure so that the test doesn't actually rely on what is set in openstack.ini to pass. [1] https://review.openstack.org/#/c/474366/ Change-Id: I5257be8cfb9483ac7dd02b893e4a22a2ee46bbf7
Notes
Notes (review): Code-Review+2: Kevin Carter (cloudnull) <kevin@cloudnull.com> Code-Review+2: Major Hayden <major@mhtx.net> Workflow+1: Major Hayden <major@mhtx.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 23 Jun 2017 19:02:16 +0000 Reviewed-on: https://review.openstack.org/476936 Project: openstack/monitorstack Branch: refs/heads/master
-rw-r--r--etc/openstack.ini2
-rw-r--r--tests/unit/test_os_utils.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/etc/openstack.ini b/etc/openstack.ini
index 9b0b659..c493a6f 100644
--- a/etc/openstack.ini
+++ b/etc/openstack.ini
@@ -7,7 +7,7 @@
7# Allow insecure TLS (https) requests. 7# Allow insecure TLS (https) requests.
8# If your SSL certificate is not valid set this option to true, 8# If your SSL certificate is not valid set this option to true,
9# else omit it or set it false. 9# else omit it or set it false.
10insecure = true 10insecure = false
11 11
12auth_url = https://127.0.0.1:5000/v3 12auth_url = https://127.0.0.1:5000/v3
13 13
diff --git a/tests/unit/test_os_utils.py b/tests/unit/test_os_utils.py
index 2316dba..e240305 100644
--- a/tests/unit/test_os_utils.py
+++ b/tests/unit/test_os_utils.py
@@ -154,10 +154,11 @@ class TestOSUtilsConnection(unittest.TestCase):
154 154
155 def test_insecure(self): 155 def test_insecure(self):
156 """Test True insecure value.""" 156 """Test True insecure value."""
157 self.osu = os_utils.OpenStack( 157 with mock.patch.dict(self.config, {'insecure': 'True'}):
158 os_auth_args=self.config 158 self.osu = os_utils.OpenStack(
159 ) 159 os_auth_args=self.config
160 self.assertFalse(self.osu.verify) 160 )
161 self.assertFalse(self.osu.verify)
161 162
162 def test_secure(self): 163 def test_secure(self):
163 """Test False insecure value.""" 164 """Test False insecure value."""