← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/provider/ec2/ec2.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-02-03 09:22:46 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140203092246-e03vg402vztzo4qa
Tags: 1.17.2-0ubuntu1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/provider/ec2/ec2.go
11
11
        "sync"
12
12
        "time"
13
13
 
 
14
        "github.com/loggo/loggo"
14
15
        "launchpad.net/goamz/aws"
15
16
        "launchpad.net/goamz/ec2"
16
17
        "launchpad.net/goamz/s3"
17
 
        "launchpad.net/loggo"
18
18
 
19
19
        "launchpad.net/juju-core/constraints"
20
20
        "launchpad.net/juju-core/environs"
188
188
    #
189
189
    # secret-key holds the ec2 secret key. It defaults to the environment
190
190
    # variable AWS_SECRET_ACCESS_KEY.
 
191
    #
 
192
    # image-stream chooses a simplestreams stream to select OS images from,
 
193
    # for example daily or released images (or any other stream available on simplestreams).
 
194
    # image-stream: "released"
191
195
 
192
196
`[1:]
193
197
}
377
381
        }
378
382
 
379
383
        series := possibleTools.OneSeries()
380
 
        spec, err := findInstanceSpec(sources, &instances.InstanceConstraint{
 
384
        spec, err := findInstanceSpec(sources, e.Config().ImageStream(), &instances.InstanceConstraint{
381
385
                Region:      e.ecfg().region(),
382
386
                Series:      series,
383
387
                Arches:      arches,