Reduce unnecessary s3 timeouts

provider/azure/environ.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package azure
 
 import (
         "fmt"
         "net/http"
         "sync"
         "time"
 
         "launchpad.net/gwacl"
 
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/cloudinit"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/environs/imagemetadata"
         "launchpad.net/juju-core/environs/instances"
         "launchpad.net/juju-core/environs/simplestreams"
+        "launchpad.net/juju-core/environs/storage"
         envtools "launchpad.net/juju-core/environs/tools"
         "launchpad.net/juju-core/instance"
         "launchpad.net/juju-core/provider"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
         "launchpad.net/juju-core/tools"
         "launchpad.net/juju-core/utils/parallel"
 )
 
 const (
@@ skipping 24 matching lines @@
         // only be accessed using a lock or a snapshot.
         sync.Mutex
 
         // name is immutable; it does not need locking.
         name string
 
         // ecfg is the environment's Azure-specific configuration.
         ecfg *azureEnvironConfig
 
         // storage is this environ's own private storage.
-        storage environs.Storage
+        storage storage.Storage
 
         // publicStorage is the public storage that this environ uses.
-        publicStorage environs.StorageReader
+        publicStorage storage.StorageReader
 
         // storageAccountKey holds an access key to this environment's
         // private storage.  This is automatically queried from Azure on
         // startup.
         storageAccountKey string
 }
 
 // azureEnviron implements Environ and HasRegion.
 var _ environs.Environ = (*azureEnviron)(nil)
 var _ simplestreams.HasRegion = (*azureEnviron)(nil)
@@ skipping 580 matching lines @@
 // into a slice of instance.Instance objects.
 func convertToInstances(services []gwacl.HostedServiceDescriptor, env *azureEnviron) []instance.Instance {
         instances := make([]instance.Instance, len(services))
         for i, service := range services {
                 instances[i] = &azureInstance{service, env}
         }
         return instances
 }
 
 // Storage is specified in the Environ interface.
-func (env *azureEnviron) Storage() environs.Storage {
+func (env *azureEnviron) Storage() storage.Storage {
         return env.getSnapshot().storage
 }
 
 // PublicStorage is specified in the Environ interface.
-func (env *azureEnviron) PublicStorage() environs.StorageReader {
+func (env *azureEnviron) PublicStorage() storage.StorageReader {
         return env.getSnapshot().publicStorage
 }
 
 // Destroy is specified in the Environ interface.
 func (env *azureEnviron) Destroy(ensureInsts []instance.Instance) error {
         logger.Debugf("destroying environment %q", env.name)
 
         // Stop all instances.
         insts, err := env.AllInstances()
         if err != nil {
@@ skipping 216 matching lines @@
 // It contains the central databases for the released and daily streams, but this may
 // become more configurable.  This variable is here as a placeholder, but also
 // as an injection point for tests.
 var baseURLs = []string{
         "http://cloud-images.ubuntu.com/daily",
 }
 
 // GetImageSources returns a list of sources which are used to search for simplestreams image metadata.
 func (env *azureEnviron) GetImageSources() ([]simplestreams.DataSource, error) {
         sources := make([]simplestreams.DataSource, 1+len(baseURLs))
-        sources[0] = environs.NewStorageSimpleStreamsDataSource(env.Storage(), "")
+        sources[0] = storage.NewStorageSimpleStreamsDataSource(env.Storage(), "")
         for i, url := range baseURLs {
                 sources[i+1] = simplestreams.NewURLDataSource(url)
         }
         return sources, nil
 }
 
 // GetToolsSources returns a list of sources which are used to search for simplestreams tools metadata.
 func (env *azureEnviron) GetToolsSources() ([]simplestreams.DataSource, error) {
         // Add the simplestreams source off the control bucket.
-        return []simplestreams.DataSource{environs.NewStorageSimpleStreamsDataSource(env.Storage(), environs.BaseToolsPath)}, nil
+        return []simplestreams.DataSource{storage.NewStorageSimpleStreamsDataSource(env.Storage(), storage.BaseToolsPath)}, nil
 }
 
 // getImageStream returns the name of the simplestreams stream from which
 // this environment wants its images, e.g. "releases" or "daily", or the
 // blank string for the default.
 func (env *azureEnviron) getImageStream() string {
         // Hard-coded to the default for now.
         return ""
 }
 
 // getImageMetadataSigningRequired returns whether this environment requires
 // image metadata from Simplestreams to be signed.
 func (env *azureEnviron) getImageMetadataSigningRequired() bool {
         // Hard-coded to true for now.  Once we support custom base URLs,
         // this may have to change.
         return true
 }
 
 // Region is specified in the HasRegion interface.
 func (env *azureEnviron) Region() (simplestreams.CloudSpec, error) {
         ecfg := env.getSnapshot().ecfg
         return simplestreams.CloudSpec{
                 Region:   ecfg.location(),
                 Endpoint: string(gwacl.GetEndpoint(ecfg.location())),
         }, nil
 }