all: use MgoSuite rather than ZkSuite

cmd/jujud/agent.go

 package main
 
 import (
         "fmt"
         "launchpad.net/gnuflag"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
         "regexp"
         "strings"
 )
 
 // requiredError is useful when complaining about missing command-line options.
 func requiredError(name string) error {
         return fmt.Errorf("--%s option must be set", name)
 }
 
 // stateInfoValue implements gnuflag.Value on a state.Info.
 type stateInfoValue state.Info
 
 var validAddr = regexp.MustCompile("^.+:[0-9]+$")
 
-// Set splits the comma-separated list of ZooKeeper addresses and stores
+// Set splits the comma-separated list of state server addresses and stores
 // onto v's Addrs. Addresses must include port numbers.
 func (v *stateInfoValue) Set(value string) error {
         addrs := strings.Split(value, ",")
         for _, addr := range addrs {
                 if !validAddr.MatchString(addr) {
-                        return fmt.Errorf("%q is not a valid zookeeper address", addr)
+                        return fmt.Errorf("%q is not a valid state server address", addr)
                 }
         }
         v.Addrs = addrs
         return nil
 }
 
-// String returns the list of ZooKeeper addresses joined by commas.
+// String returns the list of server addresses joined by commas.
 func (v *stateInfoValue) String() string {
         if v.Addrs != nil {
                 return strings.Join(v.Addrs, ",")
         }
         return ""
 }
 
 // stateInfoVar sets up a gnuflag flag analagously to FlagSet.*Var methods.
 func stateInfoVar(fs *gnuflag.FlagSet, target *state.Info, name string, value []string, usage string) {
         target.Addrs = value
         fs.Var((*stateInfoValue)(target), name, usage)
 }
 
 // AgentConf handles command-line flags shared by all agents.
 type AgentConf struct {
         DataDir   string
         StateInfo state.Info
 }
 
 // addFlags injects common agent flags into f.
 func (c *AgentConf) addFlags(f *gnuflag.FlagSet) {
         f.StringVar(&c.DataDir, "data-dir", "/var/lib/juju", "directory for juju data")
-        stateInfoVar(f, &c.StateInfo, "zookeeper-servers", nil, "zookeeper servers to connect to")
+        stateInfoVar(f, &c.StateInfo, "state-servers", nil, "state servers to connect to")
 }
 
 // checkArgs checks that required flags have been set and that args is empty.
 func (c *AgentConf) checkArgs(args []string) error {
         if c.DataDir == "" {
                 return requiredError("data-dir")
         }
         if c.StateInfo.Addrs == nil {
-                return requiredError("zookeeper-servers")
+                return requiredError("state-servers")
         }
         return cmd.CheckEmpty(args)
 }
 
 type task interface {
         Stop() error
         Wait() error
         String() string
 }
 
@@ skipping 43 matching lines @@
                         log.Printf("%s: %v", tasks[i], err)
                 }
         }
         return chosen.err
 }
 
 func isUpgraded(err error) bool {
         _, ok := err.(*UpgradedError)
         return ok
 }