Merge lp:~thumper/juju-core/juju-mongodb into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Use juju-mongodb on trusty.

This branch does the simplest thing that can work.
For trusty, juju-mongodb is always used, for other
series mongodb-server is used.

This does mean that the local provider on trusty will
now depend on juju-mongodb. James Page is aware, and
will make the dependency required for the juju-local
package when we tell him.

Tested on the local provider on trusty, and ec2 using
precise.

https://codereview.appspot.com/77300044/

Use juju-mongodb on trusty.

This branch does the simplest thing that can work.
For trusty, juju-mongodb is always used, for other
series mongodb-server is used.

This does mean that the local provider on trusty will
now depend on juju-mongodb. James Page is aware, and
will make the dependency required for the juju-local
package when we tell him.

Tested on the local provider on trusty, and ec2 using
precise.

https://codereview.appspot.com/77300044/

[Tim Penhey (thumper)]

Reviewers: mp+211642_code.launchpad.net,

Message:
Please take a look.

Description:
Use juju-mongodb on trusty.

This branch does the simplest thing that can work.
For trusty, juju-mongodb is always used, for other
series mongodb-server is used.

This does mean that the local provider on trusty will
now depend on juju-mongodb. James Page is aware, and
will make the dependency required for the juju-local
package when we tell him.

Tested on the local provider on trusty, and ec2 using
precise.

https://code.launchpad.net/~thumper/juju-core/juju-mongodb/+merge/211642

(do not edit description out of merge proposal)

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

Affected files (+56, -26 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M agent/mongo/mongo_test.go
   M environs/cloudinit/cloudinit.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-20140318032657-od048h1fmr1ocrfd
+New revision: <email address hidden>

Index: agent/mongo/mongo.go
=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go 2014-03-07 16:08:14 +0000
+++ agent/mongo/mongo.go 2014-03-18 22:21:00 +0000
@@ -25,8 +25,28 @@

   // JujuMongodPath holds the default path to the juju-specific mongod.
   JujuMongodPath = "/usr/lib/juju/bin/mongod"
+ // MongodbServerPath holds the default path to the generic mongod.
+ MongodbServerPath = "/usr/bin/mongod"
  )

+// MongoPackageForSeries returns the name of the mongo package for the
series
+// of the machine that it is going to be running on.
+func MongoPackageForSeries(series string) string {
+ if series == "trusty" {
+ return "juju-mongodb"
+ }
+ return "mongodb-server"
+}
+
+// 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" {
+ return JujuMongodPath
+ }
+ return MongodbServerPath
+}
+
  // MongoPath returns the executable path to be used to run mongod on this
  // machine. If the juju-bundled version of mongo exists, it will return
that
  // path, otherwise it will return the command to run mongod from the path.
@@ -48,8 +68,12 @@
  // This method will remove old versions of the mongo upstart script as
necessary
  // before installing the new version.
  func EnsureMongoServer(dir string, port int) error {
+ // NOTE: ensure that the right package is installed?
   name := makeServiceName(mongoScriptVersion)
- service, err := MongoUpstartService(name, dir, port)
+ // TODO: get the series from somewhere, non trusty values return
+ // the existing default path.
+ mongodPath := MongodPathForSeries("some-series")
+ service, err := MongoUpstartService(name, mongodPath, dir, port)
   if err != nil {
    return err
   }
@@ -132,7 +156,7 @@
  // MongoUpstartService returns the upstart config for the mongo state
service.
  //
  // This method assumes there is a server.pem keyfile in dataDir.
-func MongoUpstartServi...

[Ian Booth (wallyworld)]

LGTM but there's no test for the trusty vs non trusty specific content
of cloud init. I think we need that added.

https://codereview.appspot.com/77300044/diff/1/agent/mongo/mongo.go
File agent/mongo/mongo.go (right):

https://codereview.appspot.com/77300044/diff/1/agent/mongo/mongo.go#newcode75
agent/mongo/mongo.go:75: mongodPath :=
MongodPathForSeries("some-series")
we have version.readSeries()
Why not use that (after the necessary tweaking to expose the
functionality)?

https://codereview.appspot.com/77300044/

[Go Bot (go-bot)]

The attempt to merge lp:~thumper/juju-core/juju-mongodb into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.012s
ok launchpad.net/juju-core/agent 1.027s
ok launchpad.net/juju-core/agent/mongo 0.569s
ok launchpad.net/juju-core/agent/tools 0.180s
ok launchpad.net/juju-core/bzr 5.423s
ok launchpad.net/juju-core/cert 2.767s
ok launchpad.net/juju-core/charm 0.404s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.025s
ok launchpad.net/juju-core/cloudinit/sshinit 0.884s
ok launchpad.net/juju-core/cmd 0.153s
ok launchpad.net/juju-core/cmd/charm-admin 0.756s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 192.534s
ok launchpad.net/juju-core/cmd/jujud 68.585s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 7.463s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.170s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.037s
ok launchpad.net/juju-core/container 0.063s
ok launchpad.net/juju-core/container/factory 0.051s
ok launchpad.net/juju-core/container/kvm 0.248s
ok launchpad.net/juju-core/container/kvm/mock 0.043s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.309s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.238s
ok launchpad.net/juju-core/environs 2.084s
ok launchpad.net/juju-core/environs/bootstrap 3.143s
ok launchpad.net/juju-core/environs/cloudinit 0.528s
ok launchpad.net/juju-core/environs/config 1.872s
ok launchpad.net/juju-core/environs/configstore 0.037s
ok launchpad.net/juju-core/environs/filestorage 0.027s
ok launchpad.net/juju-core/environs/httpstorage 0.699s
ok launchpad.net/juju-core/environs/imagemetadata 0.476s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.045s
ok launchpad.net/juju-core/environs/jujutest 0.219s
ok launchpad.net/juju-core/environs/manual 11.305s
ok launchpad.net/juju-core/environs/simplestreams 0.231s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.902s
ok launchpad.net/juju-core/environs/storage 0.815s
ok launchpad.net/juju-core/environs/sync 43.507s
ok launchpad.net/juju-core/environs/testing 0.161s
ok launchpad.net/juju-core/environs/tools 4.521s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 19.559s
ok launchpad.net/juju-core/juju/arch 0.024s
ok laun...

[Dave Cheney (dave-cheney)]

LGTM with one minor comment

https://codereview.appspot.com/77300044/diff/1/agent/mongo/mongo.go
File agent/mongo/mongo.go (right):

https://codereview.appspot.com/77300044/diff/1/agent/mongo/mongo.go#newcode35
agent/mongo/mongo.go:35: if series == "trusty" {
I don't like the idea that we have to remember to update this in 7
months.

How about

switch series {
case "precise", "raring", "saucy":
     return "mongodb-server"
default:
     // trusty and onwards
     return :juju-mongodb"
}

https://codereview.appspot.com/77300044/diff/1/agent/mongo/mongo.go#newcode47
agent/mongo/mongo.go:47: return MongodbServerPath
same as above

https://codereview.appspot.com/77300044/

[Go Bot (go-bot)]

The attempt to merge lp:~thumper/juju-core/juju-mongodb into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.012s
ok launchpad.net/juju-core/agent 1.073s
ok launchpad.net/juju-core/agent/mongo 0.511s
ok launchpad.net/juju-core/agent/tools 0.203s
ok launchpad.net/juju-core/bzr 5.439s
ok launchpad.net/juju-core/cert 2.615s
ok launchpad.net/juju-core/charm 0.407s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.029s

----------------------------------------------------------------------
FAIL: configure_test.go:88: configureSuite.TestAptSources

configure_test.go:126:
    c.Assert(
        script,
        checkIff(gc.Matches, needsJujuPPA),
        "(.|\n)*add-apt-repository.*ppa:juju/stable(.|\n)*",
    )
... value string = "" +
... "#!/bin/bash\n" +
... "set -e\n" +
... "test -e /proc/self/fd/9 || exec 9>&2\n" +
... "(\n" +
... "export DEBIAN_FRONTEND=noninteractive\n" +
... "echo 'Running apt-get update' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes update\n" +
... "echo 'Running apt-get upgrade' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes upgrade\n" +
... "echo 'Installing package: git' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes install 'git'\n" +
... "echo 'Installing package: cpu-checker' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes install 'cpu-checker'\n" +
... "echo 'Installing package: bridge-utils' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes install 'bridge-utils'\n" +
... "echo 'Installing package: rsyslog-gnutls' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes install 'rsyslog-gnutls'\n" +
... "echo 'Installing package: juju-mongodb' >&9\n" +
... "apt-get --option Dpkg::Options::=--force-confold --assume-yes install 'juju-mongodb'\n" +
... "set -xe\n" +
... "install -D -m 644 /dev/null '/var/lib/juju/nonce.txt'\n" +
... "printf '%s\\n' 'user-admin:bootstrap' > '/var/lib/juju/nonce.txt'\n" +
... "test -e /proc/self/fd/9 || exec 9>&2\n" +
... "([ ! -e /home/ubuntu/.profile ] || grep -q '.juju-proxy' /home/ubuntu/.profile) || printf '\\n# Added by juju\\n[ -f \"$HOME/.juju-proxy\" ] && . \"$HOME/.juju-proxy\"\\n' >> /home/ubuntu/.profile\n" +
... "mkdir -p /var/lib/juju/locks\n" +
... "[ -e /home/ubuntu ] && chown ubuntu:ubuntu /var/lib/juju/locks\n" +
... "mkdir -p /var/log/juju\n" +
... "bin='/var/lib/juju/tools/1.16.0-quantal-amd64'\n" +
... "mkdir -p $bin\n" +
... "cp '/var/lib/juju/storage/tools/releases/juju-1.16.0-quantal-amd64.tgz' $bin/tools.tar.gz\n" +
... "sha256sum $bin/tools.tar.gz > $bin/juju1.16.0-quantal-amd64.sha256\n" +
... "grep '' $bin/juju1.16.0-quantal-amd64.sha256 || (echo \"Tools checksum mismatch\"; exit 1)\n" +
... "tar zxf $bin/tools.tar.gz -C $bin\n" +
... "rm $bin/tools.tar.gz && rm $bin/juju1.16.0-quantal-amd64.sha256\n" +
......

=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-03-07 16:08:14 +0000
+++ agent/mongo/mongo.go	2014-03-19 04:09:07 +0000
@@ -25,8 +25,31 @@
 
 	// JujuMongodPath holds the default path to the juju-specific mongod.
 	JujuMongodPath = "/usr/lib/juju/bin/mongod"
+	// MongodbServerPath holds the default path to the generic mongod.
+	MongodbServerPath = "/usr/bin/mongod"
 )
 
+// MongoPackageForSeries returns the name of the mongo package for the series
+// of the machine that it is going to be running on.
+func MongoPackageForSeries(series string) string {
+	switch series {
+	case "precise", "quantal", "raring", "saucy":
+		return "mongodb-server"
+	default:
+		// trusty and onwards
+		return "juju-mongodb"
+	}
+}
+
+// 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" {
+		return JujuMongodPath
+	}
+	return MongodbServerPath
+}
+
 // MongoPath returns the executable path to be used to run mongod on this
 // machine. If the juju-bundled version of mongo exists, it will return that
 // path, otherwise it will return the command to run mongod from the path.
@@ -48,8 +71,12 @@
 // This method will remove old versions of the mongo upstart script as necessary
 // before installing the new version.
 func EnsureMongoServer(dir string, port int) error {
+	// NOTE: ensure that the right package is installed?
 	name := makeServiceName(mongoScriptVersion)
-	service, err := MongoUpstartService(name, dir, port)
+	// TODO: get the series from somewhere, non trusty values return
+	// the existing default path.
+	mongodPath := MongodPathForSeries("some-series")
+	service, err := MongoUpstartService(name, mongodPath, dir, port)
 	if err != nil {
 		return err
 	}
@@ -132,7 +159,7 @@
 // MongoUpstartService returns the upstart config for the mongo state service.
 //
 // This method assumes there is a server.pem keyfile in dataDir.
-func MongoUpstartService(name, dataDir string, port int) (*upstart.Conf, error) {
+func MongoUpstartService(name, mongodExec, dataDir string, port int) (*upstart.Conf, error) {
 
 	keyFile := path.Join(dataDir, "server.pem")
 	svc := upstart.NewService(name)
@@ -146,7 +173,7 @@
 			"nofile": fmt.Sprintf("%d %d", maxFiles, maxFiles),
 			"nproc":  fmt.Sprintf("%d %d", maxProcs, maxProcs),
 		},
-		Cmd: "/usr/bin/mongod" +
+		Cmd: mongodExec +
 			" --auth" +
 			" --dbpath=" + dbDir +
 			" --sslOnNormalPorts" +

=== modified file 'agent/mongo/mongo_test.go'
--- agent/mongo/mongo_test.go	2014-03-13 07:54:56 +0000
+++ agent/mongo/mongo_test.go	2014-03-19 04:09:07 +0000
@@ -120,7 +120,8 @@
 
 	err := EnsureMongoServer(dir, port)
 	c.Assert(err, gc.IsNil)
-	svc, err := MongoUpstartService(makeServiceName(mongoScriptVersion), dir, port)
+	mongodPath := MongodPathForSeries("some-series")
+	svc, err := MongoUpstartService(makeServiceName(mongoScriptVersion), mongodPath, dir, port)
 	c.Assert(err, gc.IsNil)
 	defer svc.Remove()
 

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2014-03-17 08:25:06 +0000
+++ environs/cloudinit/cloudinit.go	2014-03-19 04:09:07 +0000
@@ -346,25 +346,31 @@
 		identityFile := cfg.dataFile(SystemIdentity)
 		c.AddFile(identityFile, cfg.SystemPrivateSSHKey, 0600)
 		if !cfg.DisablePackageCommands {
-			// Disable the default mongodb installed by the mongodb-server package.
-			// Only do this if the file doesn't exist already, so users can run
-			// their own mongodb server if they wish to.
-			c.AddBootCmd(
-				`[ -f /etc/default/mongodb ] ||
+			series := cfg.Tools.Version.Series
+			mongoPackage := mongo.MongoPackageForSeries(series)
+			if mongoPackage == "mongodb-server" {
+				// Disable the default mongodb installed by the mongodb-server package.
+				// Only do this if the file doesn't exist already, so users can run
+				// their own mongodb server if they wish to.
+				c.AddBootCmd(
+					`[ -f /etc/default/mongodb ] ||
              (echo ENABLE_MONGODB="no" > /etc/default/mongodb)`)
 
-			if cfg.NeedMongoPPA() {
-				const key = "" // key is loaded from PPA
-				c.AddAptSource("ppa:juju/stable", key, nil)
-			}
-			if cfg.Tools.Version.Series == "precise" {
-				// In precise we add the cloud-tools pocket and
-				// pin it with a lower priority, so we need to
-				// explicitly specify the target release when
-				// installing mongodb-server from there.
-				c.AddPackageFromTargetRelease("mongodb-server", "precise-updates/cloud-tools")
+				if cfg.NeedMongoPPA() {
+					const key = "" // key is loaded from PPA
+					c.AddAptSource("ppa:juju/stable", key, nil)
+				}
+				if series == "precise" {
+					// In precise we add the cloud-tools pocket and
+					// pin it with a lower priority, so we need to
+					// explicitly specify the target release when
+					// installing mongodb-server from there.
+					c.AddPackageFromTargetRelease("mongodb-server", "precise-updates/cloud-tools")
+				} else {
+					c.AddPackage("mongodb-server")
+				}
 			} else {
-				c.AddPackage("mongodb-server")
+				c.AddPackage(mongoPackage)
 			}
 		}
 		certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)
@@ -492,7 +498,8 @@
 	)
 
 	name := cfg.MongoServiceName
-	conf, err := mongo.MongoUpstartService(name, cfg.DataDir, cfg.StatePort)
+	mongodExec := mongo.MongodPathForSeries(cfg.Tools.Version.Series)
+	conf, err := mongo.MongoUpstartService(name, mongodExec, cfg.DataDir, cfg.StatePort)
 	if err != nil {
 		return err
 	}

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-03-13 20:52:41 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-03-19 04:09:07 +0000
@@ -13,7 +13,6 @@
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/agent/mongo"
 	coreCloudinit "launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -72,9 +71,6 @@
 	return s
 }
 
-// mongodPath is the path where we should expect mongod in the environment.
-var mongodPath = must(mongo.MongodPath())
-
 // Each test gives a cloudinit config - we check the
 // output to see if it looks correct.
 var cloudinitTests = []cloudinitTest{
@@ -145,7 +141,7 @@
 dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
 dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
 echo 'Starting MongoDB server \(juju-db\)'.*
-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec ` + mongodPath + ` --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
 start juju-db
 mkdir -p '/var/lib/juju/agents/bootstrap'
 install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
@@ -205,6 +201,44 @@
 ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
 `,
 	}, {
+		// trusty 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"),
+			StateServer:     true,
+			StateServerCert: serverCert,
+			StateServerKey:  serverKey,
+			StatePort:       37017,
+			APIPort:         17070,
+			MachineNonce:    "FAKE_NONCE",
+			StateInfo: &state.Info{
+				Password: "arble",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			APIInfo: &api.Info{
+				Password: "bletch",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			Constraints:             envConstraints,
+			DataDir:                 environs.DataDir,
+			LogDir:                  agent.DefaultLogDir,
+			Jobs:                    allMachineJobs,
+			CloudInitOutputLog:      environs.CloudInitOutputLog,
+			StateInfoURL:            "some-url",
+			SystemPrivateSSHKey:     "private rsa key",
+			MachineAgentServiceName: "jujud-machine-0",
+			MongoServiceName:        "juju-db",
+		},
+		setEnvConfig: true,
+		inexactMatch: true,
+		expectScripts: `
+echo 'Starting MongoDB server \(juju-db\)'.*
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
+`,
+	}, {
 		// non state server.
 		cfg: cloudinit.MachineConfig{
 			MachineId:          "99",
@@ -418,6 +452,12 @@
 // TestCloudInit checks that the output from the various tests
 // in cloudinitTests is well formed.
 func (*cloudinitSuite) TestCloudInit(c *gc.C) {
+	expectedMongoPackage := map[string]string{
+		"precise": "mongodb-server",
+		"raring":  "mongodb-server",
+		"trusty":  "juju-mongodb",
+	}
+
 	for i, test := range cloudinitTests {
 		c.Logf("test %d", i)
 		if test.setEnvConfig {
@@ -451,7 +491,9 @@
 		acfg := getAgentConfig(c, tag, scripts)
 		c.Assert(acfg, jc.Contains, "AGENT_SERVICE_NAME: jujud-"+tag)
 		if test.cfg.StateServer {
-			checkPackage(c, x, "mongodb-server", true)
+			series := test.cfg.Tools.Version.Series
+			mongoPackage := expectedMongoPackage[series]
+			checkPackage(c, x, mongoPackage, true)
 			source := "ppa:juju/stable"
 			checkAptSource(c, x, source, "", test.cfg.NeedMongoPPA())
 			c.Assert(acfg, jc.Contains, "MONGO_SERVICE_NAME: juju-db")