Merge lp:~axwalk/juju-core/lp1321025-mongod-path-1.18 into lp:juju-core/1.18

[Andrew Wilkins]

Use the right mongod binary on utopic

There was some broken code in agent/mongo
for calculating the mongod path. It special
cased trusty in two different ways.

Fixes lp:1321025

https://codereview.appspot.com/99410053/

Use the right mongod binary on utopic

There was some broken code in agent/mongo
for calculating the mongod path. It special
cased trusty in two different ways.

Fixes lp:1321025

https://codereview.appspot.com/99410053/

[Andrew Wilkins (axwalk)]

Reviewers: mp+220544_code.launchpad.net,

Message:
Please take a look.

Description:
Use the right mongod binary on utopic

There was some broken code in agent/mongo
for calculating the mongod path. It special
cased trusty in two different ways.

Fixes lp:1321025

https://code.launchpad.net/~axwalk/juju-core/lp1321025-mongod-path-1.18/+merge/220544

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/99410053/

Affected files (+6, -3 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M environs/cloudinit/cloudinit_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140513040856-lm051mdy3n916km6
+New revision: <email address hidden>

Index: agent/mongo/mongo.go
=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go 2014-03-19 04:08:45 +0000
+++ agent/mongo/mongo.go 2014-05-22 01:53:19 +0000
@@ -44,7 +44,7 @@
  // MongodPathForSeries returns the path to the mongod executable for the
  // series of the machine that it is going to be running on.
  func MongodPathForSeries(series string) string {
- if series == "trusty" {
+ if MongoPackageForSeries(series) == "juju-mongodb" {
    return JujuMongodPath
   }
   return MongodbServerPath

Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go 2014-03-24 04:05:24 +0000
+++ environs/cloudinit/cloudinit_test.go 2014-05-22 01:53:19 +0000
@@ -201,13 +201,13 @@
  ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
  `,
   }, {
- // trusty state server - use the new mongo from juju-mongodb
+ // utopic state server - use the new mongo from juju-mongodb
    cfg: cloudinit.MachineConfig{
     MachineId: "0",
     AuthorizedKeys: "sshkey1",
     AgentEnvironment: map[string]string{agent.ProviderType: "dummy"},
     // raring provides mongo in the archive
- Tools: newSimpleTools("1.2.3-trusty-amd64"),
+ Tools: newSimpleTools("1.2.3-utopic-amd64"),
     StateServer: true,
     StateServerCert: serverCert,
     StateServerKey: serverKey,
@@ -457,6 +457,7 @@
    "precise": "mongodb-server",
    "raring": "mongodb-server",
    "trusty": "juju-mongodb",
+ "utopic": "juju-mongodb",
   }

   for i, test := range cloudinitTests {

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/99410053/

[John A Meinel (jameinel)]

So really, our logic *should* be to blacklist precise and raring, rather than whitelisting trusty and utopic. (so we should return juju-mongodb unless precise and raring).

That will let us still "just work" once V is out.

=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-03-19 04:08:45 +0000
+++ agent/mongo/mongo.go	2014-05-22 02:08:22 +0000
@@ -44,7 +44,7 @@
 // MongodPathForSeries returns the path to the mongod executable for the
 // series of the machine that it is going to be running on.
 func MongodPathForSeries(series string) string {
-	if series == "trusty" {
+	if MongoPackageForSeries(series) == "juju-mongodb" {
 		return JujuMongodPath
 	}
 	return MongodbServerPath

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-03-24 04:05:24 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-05-22 02:08:22 +0000
@@ -201,13 +201,13 @@
 ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
 `,
 	}, {
-		// trusty state server - use the new mongo from juju-mongodb
+		// utopic state server - use the new mongo from juju-mongodb
 		cfg: cloudinit.MachineConfig{
 			MachineId:        "0",
 			AuthorizedKeys:   "sshkey1",
 			AgentEnvironment: map[string]string{agent.ProviderType: "dummy"},
 			// raring provides mongo in the archive
-			Tools:           newSimpleTools("1.2.3-trusty-amd64"),
+			Tools:           newSimpleTools("1.2.3-utopic-amd64"),
 			StateServer:     true,
 			StateServerCert: serverCert,
 			StateServerKey:  serverKey,
@@ -457,6 +457,7 @@
 		"precise": "mongodb-server",
 		"raring":  "mongodb-server",
 		"trusty":  "juju-mongodb",
+		"utopic":  "juju-mongodb",
 	}
 
 	for i, test := range cloudinitTests {