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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/agent/simplestreams.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:
10
10
        "io/ioutil"
11
11
        "path"
12
12
 
13
 
        "github.com/juju/juju/environs"
14
13
        "github.com/juju/juju/environs/simplestreams"
15
14
        "github.com/juju/juju/state/storage"
16
15
)
81
80
func (d environmentStorageDataSource) RequireSigned() bool {
82
81
        return d.requireSigned
83
82
}
84
 
 
85
 
// registerSimplestreamsDataSource registers a environmentStorageDataSource.
86
 
func registerSimplestreamsDataSource(stor storage.Storage, requireSigned bool) {
87
 
        ds := NewModelStorageDataSource(stor, simplestreams.DEFAULT_CLOUD_DATA, requireSigned)
88
 
        environs.RegisterUserImageDataSourceFunc(storageDataSourceId, func(environs.Environ) (simplestreams.DataSource, error) {
89
 
                return ds, nil
90
 
        })
91
 
}
92
 
 
93
 
// unregisterSimplestreamsDataSource de-registers an environmentStorageDataSource.
94
 
func unregisterSimplestreamsDataSource() {
95
 
        environs.UnregisterImageDataSourceFunc(storageDataSourceId)
96
 
}