← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to environs/local/environ.go

  • Committer: Dimiter Naydenov
  • Date: 2013-07-29 15:15:41 UTC
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: dimiter.naydenov@canonical.com-20130729151541-zm8murwo9u7mtsdu
names: new package

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/local/environ.go
21
21
        "launchpad.net/juju-core/environs/config"
22
22
        "launchpad.net/juju-core/environs/localstorage"
23
23
        "launchpad.net/juju-core/instance"
 
24
        "launchpad.net/juju-core/names"
24
25
        "launchpad.net/juju-core/state"
25
26
        "launchpad.net/juju-core/state/api"
26
27
        "launchpad.net/juju-core/upstart"
474
475
        err = tools.UnpackTools(dataDir, agentTools, toolsFile)
475
476
 
476
477
        machineId := "0" // Always machine 0
477
 
        tag := state.MachineTag(machineId)
 
478
        tag := names.MachineTag(machineId)
478
479
        toolsDir := tools.SharedToolsDir(dataDir, agentTools.Version)
479
480
        logDir := env.config.logDir()
480
481
        logConfig := "--debug" // TODO(thumper): specify loggo config
507
508
                logger.Errorf("failed to get state info to write bootstrap agent file: %v", err)
508
509
                return err
509
510
        }
510
 
        tag := state.MachineTag("0")
 
511
        tag := names.MachineTag("0")
511
512
        info.Tag = tag
512
513
        apiInfo.Tag = tag
513
514
        conf := &agent.Conf{