← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gopkg.in/amz.v3/ec2/ec2.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:
src/gopkg.in/amz.v3/ec2/ec2.go
267
267
        DisableAPITermination bool
268
268
        ShutdownBehavior      string
269
269
        PrivateIPAddress      string
 
270
        IAMInstanceProfile    string
270
271
        BlockDeviceMappings   []BlockDeviceMapping
271
272
        NetworkInterfaces     []RunNetworkInterface
272
273
        EBSOptimized          bool
290
291
        InstanceId          string                       `xml:"instanceId"`
291
292
        InstanceType        string                       `xml:"instanceType"`
292
293
        ImageId             string                       `xml:"imageId"`
 
294
        IAMInstanceProfile  string                       `xml:"iamInstanceProfile>id"`
293
295
        PrivateDNSName      string                       `xml:"privateDnsName"`
294
296
        DNSName             string                       `xml:"dnsName"`
295
297
        IPAddress           string                       `xml:"ipAddress"`
403
405
        if options.PrivateIPAddress != "" {
404
406
                params["PrivateIpAddress"] = options.PrivateIPAddress
405
407
        }
 
408
        if options.IAMInstanceProfile != "" {
 
409
                params["IamInstanceProfile.Name"] = options.IAMInstanceProfile
 
410
        }
406
411
        if options.EBSOptimized {
407
412
                params["EbsOptimized"] = "true"
408
413
        }