~rogpeppe/juju-core/438-local-instance-Addresses

« back to all changes in this revision

Viewing changes to environs/manual/agent.go

  • Committer: Tarmac
  • Author(s): William Reade
  • Date: 2013-10-02 10:38:04 UTC
  • mfrom: (1915.1.3 juju-core)
  • Revision ID: tarmac-20131002103804-zxlnv7ik17unxc3p
[r=fwereade] provider/common: Destroy, and tests

Added a common implementation of Destroy, and tests for Bootstrap which had
somehow never been written. Also drive-by removed the machineId arg from
consideration when bootstrapping, because, WTF... a non-0 bootstrap machine
would break *everything*.

https://codereview.appspot.com/14254043/

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
        // we'll just generate a shell script.
70
70
        var mcfg *cloudinit.MachineConfig
71
71
        if args.bootstrap {
72
 
                mcfg = environs.NewBootstrapMachineConfig(args.machineId, args.stateFileURL)
 
72
                mcfg = environs.NewBootstrapMachineConfig(args.stateFileURL)
73
73
        } else {
74
74
                mcfg = environs.NewMachineConfig(args.machineId, args.nonce, args.stateInfo, args.apiInfo)
75
75
        }