Implement manual bootstrapping

cmd/juju/bootstrap.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "fmt"
         "strings"
 
         "launchpad.net/gnuflag"
@@ skipping 48 matching lines @@
 // Run connects to the environment specified on the command line and bootstraps
 // a juju in that environment if none already exists. If there is as yet no environments.yaml file,
 // the user is informed how to create one.
 func (c *BootstrapCommand) Run(ctx *cmd.Context) error {
         // TODO(rog): arrange for PrepareFromName to write any additional
         // config attributes, or do so after calling it.
         environ, err := environs.PrepareFromName(c.EnvName)
         if err != nil {
                 return err
         }
+        // If the environment has a special bootstrap Storage, use it wherever
+        // we'd otherwise use environ.Storage.
+        if bs, ok := environ.(environs.BootstrapStorager); ok {
+                bootstrapStorage, err := bs.BootstrapStorage()
+                if err != nil {
+                        return fmt.Errorf("failed to acquire bootstrap storage: %v", err)
+                }
+                environ = &bootstrapStorageEnviron{environ, bootstrapStorage}
+        }
         // TODO: if in verbose mode, write out to Stdout if a new cert was created.
         _, err = environs.EnsureCertificate(environ, environs.WriteCertAndKey)
         if err != nil {
                 return err
         }
         // If we are using a local provider, always upload tools.
         if environ.Config().Type() == provider.Local {
                 c.UploadTools = true
         }
         if c.UploadTools {
@@ skipping 80 matching lines @@
 // probably upload, based on cfg.
 func getUploadSeries(cfg *config.Config, series []string) []string {
         unique := set.NewStrings(series...)
         if unique.IsEmpty() {
                 unique.Add(version.Current.Series)
                 unique.Add(config.DefaultSeries)
                 unique.Add(cfg.DefaultSeries())
         }
         return unique.Values()
 }
+
+type bootstrapStorageEnviron struct {
+        environs.Environ
+        bootstrapStorage environs.Storage
+}
+
+func (b *bootstrapStorageEnviron) Storage() environs.Storage {
+        return b.bootstrapStorage
+}