diff options
| author | Andreas Nilsson <andreas.nilsson@10gen.com> | 2014-10-07 16:59:05 -0400 |
|---|---|---|
| committer | Andreas Nilsson <andreas.nilsson@10gen.com> | 2014-10-10 09:55:13 -0400 |
| commit | eb3435c25eabc90e2c4ff7c331c94c4c222d0b7e (patch) | |
| tree | 63b73d91f489eacd599035e417cff62998ef8a0e /buildscripts | |
| parent | b179fa1eab1bc79be8562349ca6f43283f16ecc7 (diff) | |
| download | mongo-eb3435c25eabc90e2c4ff7c331c94c4c222d0b7e.tar.gz | |
SERVER-15236 Using SCRAM-SHA-1 for keyfile authentication
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/smoke.py | 2 | ||||
| -rw-r--r-- | buildscripts/smoke_config/auth.yaml | 4 | ||||
| -rw-r--r-- | buildscripts/smoke_config/auth_shell.yaml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index d8884c6e3dc..fa00b907a12 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -1242,7 +1242,7 @@ def main(): parser.add_option('--use-x509', dest='use_x509', default=False, action="store_true", help='Use x509 auth for internal cluster authentication') - parser.add_option('--authMechanism', dest='authMechanism', default='MONGODB-CR', + parser.add_option('--authMechanism', dest='authMechanism', default='SCRAM-SHA-1', help='Use the given authentication mechanism, when --auth is used.') parser.add_option('--keyFile', dest='keyFile', default=None, help='Path to keyFile to use to run replSet and sharding tests with authentication enabled') diff --git a/buildscripts/smoke_config/auth.yaml b/buildscripts/smoke_config/auth.yaml index 102c8721b3f..9f4660fa831 100644 --- a/buildscripts/smoke_config/auth.yaml +++ b/buildscripts/smoke_config/auth.yaml @@ -14,14 +14,14 @@ executor: shell_globals: TestData: auth: true - authMechanism: MONGODB-CR + authMechanism: SCRAM-SHA-1 keyFile: ./jstests/lib/authTestsKey keyFileData: Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly testers: js_test: shell_options: authenticationDatabase: local - authenticationMechanism: MONGODB-CR + authenticationMechanism: SCRAM-SHA-1 password: Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly username: __system diff --git a/buildscripts/smoke_config/auth_shell.yaml b/buildscripts/smoke_config/auth_shell.yaml index 56388ebb555..b89b776cfd8 100644 --- a/buildscripts/smoke_config/auth_shell.yaml +++ b/buildscripts/smoke_config/auth_shell.yaml @@ -8,14 +8,14 @@ executor: shell_globals: TestData: auth: true - authMechanism: MONGODB-CR + authMechanism: SCRAM-SHA-1 keyFile: ./jstests/lib/authTestsKey keyFileData: Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly testers: js_test: shell_options: authenticationDatabase: local - authenticationMechanism: MONGODB-CR + authenticationMechanism: SCRAM-SHA-1 password: Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly username: __system |