Added LogDir to agent conf, upgrade steps

environs/cloudinit_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package environs_test
 
 import (
         "time"
 
         gc "launchpad.net/gocheck"
         "launchpad.net/goyaml"
@@ skipping 158 matching lines @@
                         CACert:   []byte("CA CERT\n" + testing.CACert),
                         Tag:      "machine-10",
                 },
                 APIInfo: &api.Info{
                         Addrs:    []string{"127.0.0.1:1234"},
                         Password: "pw2",
                         CACert:   []byte("CA CERT\n" + testing.CACert),
                         Tag:      "machine-10",
                 },
                 DataDir:                 environs.DataDir,
-                LogDir:                  environs.LogDir,
+                LogDir:                  agent.DefaultLogDir,
                 CloudInitOutputLog:      environs.CloudInitOutputLog,
                 RsyslogConfPath:         environs.RsyslogConfPath,
                 Config:                  envConfig,
                 StatePort:               envConfig.StatePort(),
                 APIPort:                 envConfig.APIPort(),
                 SyslogPort:              envConfig.SyslogPort(),
                 StateServer:             stateServer,
                 AgentEnvironment:        map[string]string{agent.ProviderType: "dummy"},
                 AuthorizedKeys:          "wheredidileavemykeys",
                 MachineAgentServiceName: "jujud-machine-10",
@@ skipping 38 matching lines @@
                         "ssh_authorized_keys": []interface{}{"wheredidileavemykeys"},
                 })
         } else {
                 // Just check that the cloudinit config looks good,
                 // and that there are more runcmds than the additional
                 // ones we passed into ComposeUserData.
                 c.Check(config["apt_upgrade"], gc.Equals, true)
                 c.Check(len(runCmd) > 2, jc.IsTrue)
         }
 }