mongo stuff to agent/mongod, add EnsureMongoServer

environs/cloudinit/cloudinit.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package cloudinit
 
 import (
         "encoding/base64"
         "encoding/json"
         "fmt"
         "path"
         "strings"
 
         "github.com/errgo/errgo"
         "launchpad.net/goyaml"
 
         "launchpad.net/juju-core/agent"
+        "launchpad.net/juju-core/agent/mongo"
         agenttools "launchpad.net/juju-core/agent/tools"
         "launchpad.net/juju-core/cloudinit"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/instance"
         "launchpad.net/juju-core/juju/osenv"
         "launchpad.net/juju-core/log/syslog"
         "launchpad.net/juju-core/names"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
@@ skipping 474 matching lines @@
         c.AddScripts(
                 "mkdir -p "+dbDir+"/journal",
                 "chmod 0700 "+dbDir,
                 // Otherwise we get three files with 100M+ each, which takes time.
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.0",
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.1",
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.2",
         )
 
         name := cfg.MongoServiceName
-        conf := upstart.MongoUpstartService(name, cfg.DataDir, dbDir, cfg.StatePort)
+        conf, err := mongo.MongoUpstartService(name, cfg.DataDir, cfg.StatePort)
+        if err != nil {
+                return err
+        }
         cmds, err := conf.InstallCommands()
         if err != nil {
                 return errgo.Annotate(err, "cannot make cloud-init upstart script for the state database")
         }
         c.AddRunCmd(cloudinit.LogProgressCmd("Starting MongoDB server (%s)", name))
         c.AddScripts(cmds...)
         return nil
 }
 
 // versionDir converts a tools URL into a name
@@ skipping 201 matching lines @@
                 }
                 if cfg.APIInfo.Tag != names.MachineTag(cfg.MachineId) {
                         return fmt.Errorf("entity tag must match started machine")
                 }
         }
         if cfg.MachineNonce == "" {
                 return fmt.Errorf("missing machine nonce")
         }
         return nil
 }