summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorAndreas Nilsson <andreas.nilsson@10gen.com>2013-10-07 21:22:46 -0400
committerAndreas Nilsson <andreas.nilsson@10gen.com>2013-10-09 14:24:29 -0400
commitaef38b7e2ce7c78716f1ed3ab0f7252e4664cfe2 (patch)
tree921383476245f168f7de3ad7d854e67655d9c0fb /buildscripts
parent7ada7a8e110f5dc2c22a49aa7cea175bb9704a81 (diff)
downloadmongo-aef38b7e2ce7c78716f1ed3ab0f7252e4664cfe2.tar.gz
SERVER-8864 SSL mixed mode cmd line parameters
Diffstat (limited to 'buildscripts')
-rwxr-xr-xbuildscripts/smoke.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 4c15119ebe8..d09f1cbde13 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -167,7 +167,7 @@ class mongod(object):
def setup_admin_user(self, port=mongod_port):
try:
- Connection( "localhost" , int(port) ).admin.command("createUser", "admin",
+ Connection( "localhost" , int(port), ssl=use_ssl ).admin.command("createUser", "admin",
pwd="password",
roles=["__system"])
except OperationFailure, e:
@@ -222,7 +222,7 @@ class mongod(object):
argv += ['--setParameter', 'authenticationMechanisms=' + authMechanism]
self.auth = True
if self.kwargs.get('use_ssl') or self.kwargs.get('use_x509'):
- argv += ['--sslOnNormalPorts',
+ argv += ['--sslMode', "sslOnly",
'--sslPEMKeyFile', 'jstests/libs/server.pem',
'--sslCAFile', 'jstests/libs/ca.pem',
'--sslWeakCertificateValidation']