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

« back to all changes in this revision

Viewing changes to provider/null/environ.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:
85
85
        return e.envConfig().Name()
86
86
}
87
87
 
88
 
func (e *nullEnviron) Bootstrap(_ constraints.Value, possibleTools tools.List, machineID string) error {
 
88
func (e *nullEnviron) Bootstrap(_ constraints.Value, possibleTools tools.List) error {
89
89
        return manual.Bootstrap(manual.BootstrapArgs{
90
90
                Host:          e.envConfig().sshHost(),
91
91
                DataDir:       dataDir,
92
92
                Environ:       e,
93
 
                MachineId:     machineID,
94
93
                PossibleTools: possibleTools,
95
94
        })
96
95
}