Merge pull request #3 from mindolo/master

Fix bootstrap option
crisidev · Jul 4, 2017 · 7e33ae1 · 7e33ae1
2 parents bbafaf8 + 10a6914
commit 7e33ae1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+vault-ca (0.5-2.1) unstable; urgency=medium
+
+  * Fix bootstrap argument parsing.
+
+ -- Matteo Bigoi <bigo@crisidev.org>  Wed, 05 Jul 2017 00:02:23 +0100
+
 vault-ca (0.5-2) unstable; urgency=low
 
   * update package support only python2 and python3

diff --git a/tests/test_vault_ca.py b/tests/test_vault_ca.py
@@ -122,7 +122,7 @@ def test_manager_args_bootstrap_ca_ssl_verify(tmpdir):
     assert ca.domain == 'test.org'
     assert ca.vault_token == 'atoken'
     assert ca.bootstrap_ca
-    assert ca.ssl_verify
+    assert not ca.ssl_verify
     assert os.path.isdir(ca.output_dir)
     assert ca.vault_address == 'https://vault.test.org:8200'
     assert ca.valid_interval == 1

diff --git a/vault_ca/__init__.py b/vault_ca/__init__.py
@@ -55,7 +55,7 @@ def _manage_args(self, kwargs):
         self.vault_token = kwargs['vault_token']
         self.output_dir = kwargs.get('output_dir') or self.CA_PATH.format(self.domain)
         self.bootstrap_ca = kwargs.get('bootstrap_ca')
-        if self.bootstrap_ca and kwargs.get('ssl_verify') is not True:
+        if self.bootstrap_ca:
             self.ssl_verify = False
         else:
             self.ssl_verify = kwargs.get('ssl_verify')