HA: upgrade upstart and initiate replset

worker/peergrouper/initiate.go

 // Copyright 2014 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package peergrouper
 
 import (
         "fmt"
 
         "labix.org/v2/mgo"
 
@@ skipping 21 matching lines @@
 // If no existing configuration is found one is created using Initiate.
 func MaybeInitiateMongoServer(p InitiateMongoParams) error {
         logger.Debugf("Initiating mongo replicaset; dialInfo %#v; memberHostport %q; user %q; password %q", p.DialInfo, p.MemberHostPort, p.User, p.Password)
         defer logger.Infof("finished MaybeInitiateMongoServer")
 
         if len(p.DialInfo.Addrs) > 1 {
                 logger.Infof("more than one member; replica set must be already initiated")
                 return nil
         }
         p.DialInfo.Direct = true
+
+        // TODO(rog) remove this code when we no longer need to upgrade
+        // from pre-HA-capable environments.
+        if p.User != "" {
+                p.DialInfo.Username = p.User
+                p.DialInfo.Password = p.Password
+        }
+
         session, err := mgo.DialWithInfo(p.DialInfo)
         if err != nil {
                 return fmt.Errorf("can't dial mongo to initiate replicaset: %v", err)
         }
         defer session.Close()
 
-        // TODO(rog) remove this code when we no longer need to upgrade
-        // from pre-HA-capable environments.
-        if p.User != "" {
-                err := session.DB("admin").Login(p.User, p.Password)
-                if err != nil {
-                        logger.Errorf("cannot login to admin db as %q, password %q, falling back: %v", p.User, p.Password, err)
-                }
-        }
         cfg, err := replicaset.CurrentConfig(session)
         if err == nil && len(cfg.Members) > 0 {
                 logger.Infof("replica set configuration already found: %#v", cfg)
                 return nil
         }
         if err != nil && err != mgo.ErrNotFound {
                 return fmt.Errorf("cannot get replica set configuration: %v", err)
         }
         err = replicaset.Initiate(
                 session,
                 p.MemberHostPort,
                 mongo.ReplicaSetName,
                 map[string]string{
                         jujuMachineTag: agent.BootstrapMachineId,
                 },
         )
         if err != nil {
                 return fmt.Errorf("cannot initiate replica set: %v", err)
         }
         return nil
 }