Mercurial > hg > thermostat-ng > agent
changeset 1741:91c0f17d7366
Allow for thermostat-setup to work with mongodb <= 2.2
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-May/013854.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Thu, 28 May 2015 14:57:42 +0200 |
| parents | a1c7370468fd |
| children | 2a8d8d43418b |
| files | distribution/scripts/thermostat-setup integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/scripts/thermostat-setup Wed May 27 18:29:13 2015 +0200 +++ b/distribution/scripts/thermostat-setup Thu May 28 14:57:42 2015 +0200 @@ -282,10 +282,16 @@ var v = db.version(); var minorMicro = v.substr(v.indexOf('.') + 1) var minorVersion = minorMicro.substr(0, minorMicro.indexOf('.')) -if ( minorVersion <= 4 ) { - db.addUser({ user: "$USERNAME", pwd: "$PASSWORD", roles: [ "readWrite" ] }) +if ( minorVersion <= 2 ) { + // mongodb version 2.2 and below don't have the third argument. + // this should create the user as read + write. + db.addUser("$USERNAME","$PASSWORD") } else { - db.createUser({ user: "$USERNAME", pwd: "$PASSWORD", roles: [ "readWrite" ] }) + if ( minorVersion <= 4 ) { + db.addUser({ user: "$USERNAME", pwd: "$PASSWORD", roles: [ "readWrite" ] }) + } else { + db.createUser({ user: "$USERNAME", pwd: "$PASSWORD", roles: [ "readWrite" ] }) + } } quit() EOF
--- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Wed May 27 18:29:13 2015 +0200 +++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Thu May 28 14:57:42 2015 +0200 @@ -380,6 +380,9 @@ mongoSpawn.send("var v = db.version()\n"); mongoSpawn.send("var minorMicro = v.substr(v.indexOf('.') + 1)\n"); mongoSpawn.send("var minorVersion = minorMicro.substr(0, minorMicro.indexOf('.'))\n"); + mongoSpawn.send("if ( minorVersion <= 2 ) {"); + mongoSpawn.send(String.format("db.addUser(\"%s\", \"%s\")", mongodbUsername, mongodbPassword)); + mongoSpawn.send("} else {"); mongoSpawn.send("if ( minorVersion <= 4 ) {"); mongoSpawn.send(String.format("db.addUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })", mongodbUsername, mongodbPassword)); @@ -387,6 +390,7 @@ mongoSpawn.send(String.format("db.createUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })", mongodbUsername, mongodbPassword)); mongoSpawn.send("}\n"); + mongoSpawn.send("}\n"); mongoSpawn.send("quit()\n"); mongoSpawn.expectClose();