← Back to branch summary

~jaywink/juju-core/juju-core

« back to all changes in this revision

Viewing changes to provider/local/environ.go

  • Committer: Jason Robinson
  • Date: 2013-09-20 18:19:37 UTC
  • mfrom: (1828.2.34 juju-core)
  • Revision ID: mail@jasonrobinson.me-20130920181937-02pl68iuf36v647k
Merged latest

Show diffs side-by-side

added added

removed removed

Lines of Context:
provider/local/environ.go
21
21
        "launchpad.net/juju-core/environs/bootstrap"
22
22
        "launchpad.net/juju-core/environs/cloudinit"
23
23
        "launchpad.net/juju-core/environs/config"
24
 
        "launchpad.net/juju-core/environs/localstorage"
 
24
        "launchpad.net/juju-core/environs/filestorage"
 
25
        "launchpad.net/juju-core/environs/httpstorage"
 
26
        "launchpad.net/juju-core/environs/storage"
25
27
        "launchpad.net/juju-core/instance"
26
28
        "launchpad.net/juju-core/juju/osenv"
27
29
        "launchpad.net/juju-core/names"
164
166
        } else if !info.Mode().IsDir() {
165
167
                return nil, fmt.Errorf("%q exists but is not a directory (and it needs to be)", dir)
166
168
        }
167
 
        return localstorage.Serve(address, dir)
 
169
        storage, err := filestorage.NewFileStorageWriter(dir, filestorage.UseDefaultTmpDir)
 
170
        if err != nil {
 
171
                return nil, err
 
172
        }
 
173
        return httpstorage.Serve(address, storage)
168
174
}
169
175
 
170
176
// SetConfig is specified in the Environ interface.
318
324
}
319
325
 
320
326
// Storage is specified in the Environ interface.
321
 
func (env *localEnviron) Storage() environs.Storage {
322
 
        return localstorage.Client(env.config.storageAddr())
 
327
func (env *localEnviron) Storage() storage.Storage {
 
328
        return httpstorage.Client(env.config.storageAddr())
323
329
}
324
330
 
325
331
// PublicStorage is specified in the Environ interface.
326
 
func (env *localEnviron) PublicStorage() environs.StorageReader {
327
 
        return localstorage.Client(env.config.sharedStorageAddr())
 
332
func (env *localEnviron) PublicStorage() storage.StorageReader {
 
333
        return httpstorage.Client(env.config.sharedStorageAddr())
328
334
}
329
335
 
330
336
// Destroy is specified in the Environ interface.