~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/juju/testing/instance.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
205
205
        if err != nil {
206
206
                return nil, errors.Trace(err)
207
207
        }
208
 
        eUUID, _ := env.Config().UUID()
209
 
        instanceConfig.Tags[tags.JujuModel] = eUUID
 
208
        instanceConfig.Tags[tags.JujuModel] = env.Config().UUID()
210
209
        params.Tools = possibleTools
211
210
        params.InstanceConfig = instanceConfig
212
211
        return env.StartInstance(params)