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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/provisioner/provisioninginfo.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
500
500
        cfg := env.Config()
501
501
        toModel := func(m *imagemetadata.ImageMetadata, mSeries string, source string, priority int) cloudimagemetadata.Metadata {
502
502
                result := cloudimagemetadata.Metadata{
503
 
                        cloudimagemetadata.MetadataAttributes{
 
503
                        MetadataAttributes: cloudimagemetadata.MetadataAttributes{
504
504
                                Region:          m.RegionName,
505
505
                                Arch:            m.Arch,
506
506
                                VirtType:        m.VirtType,
510
510
                                Stream:          m.Stream,
511
511
                                Version:         m.Version,
512
512
                        },
513
 
                        priority,
514
 
                        m.Id,
 
513
                        Priority: priority,
 
514
                        ImageId:  m.Id,
515
515
                }
516
516
                // TODO (anastasiamac 2016-08-24) This is a band-aid solution.
517
517
                // Once correct value is read from simplestreams, this needs to go.