[MediaWiki-commits] [Gerrit] cassandra: fail on missing CA/cert subject - change (operations/puppet)

2015-09-10 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237358

Change subject: cassandra: fail on missing CA/cert subject
..

cassandra: fail on missing CA/cert subject

Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c
---
M modules/cassandra/files/cassandra-ca-mgr
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/237358/1

diff --git a/modules/cassandra/files/cassandra-ca-mgr 
b/modules/cassandra/files/cassandra-ca-mgr
index b76f8fe..4f55a5d 100755
--- a/modules/cassandra/files/cassandra-ca-mgr
+++ b/modules/cassandra/files/cassandra-ca-mgr
@@ -133,7 +133,7 @@
 self.crt = os.path.join(self.base, name, "%s.crt" % name)
 self.password = password
 self.size = size
-self.subject = KeytoolSubject(self.name, **cert)
+self.subject = KeytoolSubject(self.name, **cert["subject"])
 self.valid = int(cert.get("valid", 365))
 
 mkdirs(os.path.join(self.base, name))
@@ -247,7 +247,7 @@
 self.truststore = os.path.join(self.base, "truststore")
 self.key = key
 self.password = password
-self.subject = OpensslSubject(name, **(kwargs.get("subject", dict(
+self.subject = OpensslSubject(name, **kwargs["subject"])
 self.valid = int(kwargs.get("valid", 365))
 
 def generate(self):

-- 
To view, visit https://gerrit.wikimedia.org/r/237358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] cassandra: fail on missing CA/cert subject - change (operations/puppet)

2015-09-10 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: fail on missing CA/cert subject
..


cassandra: fail on missing CA/cert subject

Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c
---
M modules/cassandra/files/cassandra-ca-mgr
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/cassandra/files/cassandra-ca-mgr 
b/modules/cassandra/files/cassandra-ca-mgr
index b76f8fe..4f55a5d 100755
--- a/modules/cassandra/files/cassandra-ca-mgr
+++ b/modules/cassandra/files/cassandra-ca-mgr
@@ -133,7 +133,7 @@
 self.crt = os.path.join(self.base, name, "%s.crt" % name)
 self.password = password
 self.size = size
-self.subject = KeytoolSubject(self.name, **cert)
+self.subject = KeytoolSubject(self.name, **cert["subject"])
 self.valid = int(cert.get("valid", 365))
 
 mkdirs(os.path.join(self.base, name))
@@ -247,7 +247,7 @@
 self.truststore = os.path.join(self.base, "truststore")
 self.key = key
 self.password = password
-self.subject = OpensslSubject(name, **(kwargs.get("subject", dict(
+self.subject = OpensslSubject(name, **kwargs["subject"])
 self.valid = int(kwargs.get("valid", 365))
 
 def generate(self):

-- 
To view, visit https://gerrit.wikimedia.org/r/237358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits