bootstrap: Added configurable timeout and delays

cmd/juju/bootstrap.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "fmt"
         "io"
         "os"
+        "path/filepath"
         "strings"
 
         "launchpad.net/gnuflag"
 
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/bootstrap"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/environs/configstore"
         "launchpad.net/juju-core/environs/imagemetadata"
         "launchpad.net/juju-core/environs/sync"
         "launchpad.net/juju-core/environs/tools"
         "launchpad.net/juju-core/provider"
+        "launchpad.net/juju-core/utils"
         "launchpad.net/juju-core/utils/set"
         "launchpad.net/juju-core/version"
 )
 
 const bootstrapDoc = `
 bootstrap starts a new environment of the current type (it will return an error
 if the environment has already been bootstrapped).  Bootstrapping an environment
 will provision a new machine in the environment and run the juju state server on
 that machine.
 
 If constraints are specified in the bootstrap command, they will apply to the·
 machine provisioned for the juju state server.  They will also be set as default
 constraints on the environment for all future machines, exactly as if the
 constraints were set with juju set-constraints.
 
 Bootstrap initializes the cloud environment synchronously and displays information
 about the current installation steps.  The time for bootstrap to complete varies·······
 across cloud providers from a few seconds to several minutes.  Once bootstrap has·
 completed, you can run other juju commands against your environment. You can change
 the default timeout and retry delays used during the bootstrap by changing the
 following settings in your environments.yaml (all values represent number of seconds):
 
-    # How long to wait for a SSH connection to the state server.
-    bootstrap-ssh-timeout: 600 # default: 10 minutes

[natefinch, 2014/01/29 20:10:50]

ssh is an internal detail that will just be confusing to users.  This is just
the "bootstrap-timeout" to an end user.
 Same goes for retry delay and addresses delay.

+    # How long to wait for a connection to the state server.
+    bootstrap-timeout: 600 # default: 10 minutes
     # How long to wait between connection attempts to a state server address.
-    bootstrap-ssh-retry-delay: 5 # default: 5 seconds
+    bootstrap-retry-delay: 5 # default: 5 seconds
     # How often to refresh state server addresses from the API server.
-    bootstrap-ssh-addresses-delay: 10 # default: 10 seconds
+    bootstrap-addresses-delay: 10 # default: 10 seconds
 
 Private clouds may need to specify their own custom image metadata, and possibly upload
 Juju tools to cloud storage if no outgoing Internet access is available. In this case,
 use the --metadata-source paramater to tell bootstrap a local directory from which to
 upload tools and/or image metadata.
 
 See Also:
    juju help switch
    juju help constraints
    juju help set-constraints
@@ skipping 18 matching lines @@
 }
 
 func (c *BootstrapCommand) SetFlags(f *gnuflag.FlagSet) {
         c.EnvCommandBase.SetFlags(f)
         f.Var(constraints.ConstraintsValue{&c.Constraints}, "constraints", "set environment constraints")
         f.BoolVar(&c.UploadTools, "upload-tools", false, "upload local version of tools before bootstrapping")
         f.Var(seriesVar{&c.Series}, "series", "upload tools for supplied comma-separated series list")
         f.StringVar(&c.MetadataSource, "metadata-source", "", "local path to use as tools and/or metadata source")
 }
 
-func (c *BootstrapCommand) Init(args []string) error {
+func (c *BootstrapCommand) Init(args []string) (err error) {
         if len(c.Series) > 0 && !c.UploadTools {
                 return fmt.Errorf("--series requires --upload-tools")
+        }
+        if c.MetadataSource != "" {
+                c.MetadataSource, err = utils.NormalizePath(c.MetadataSource)
+                if err != nil {
+                        return err
+                }
+                c.MetadataSource, err = filepath.Abs(c.MetadataSource)
+                if err != nil {
+                        return err
+                }
         }
         return cmd.CheckEmpty(args)
 }
 
 type bootstrapContext struct {
         *cmd.Context
 }
 
 func (c bootstrapContext) Stdin() io.Reader {
         return c.Context.Stdin
@@ skipping 27 matching lines @@
                         return fmt.Errorf("failed to enable bootstrap storage: %v", err)
                 }
         }
         if err := bootstrap.EnsureNotBootstrapped(environ); err != nil {
                 return err
         }
         // If --metadata-source is specified, override the default tools and image metadata sources.
         if c.MetadataSource != "" {
                 logger.Infof("Setting default tools and image metadata sources: %s", c.MetadataSource)
                 tools.DefaultBaseURL = c.MetadataSource
-                imagemetadata.DefaultBaseURL = c.MetadataSource
                 if err := imagemetadata.UploadImageMetadata(environ.Storage(), c.MetadataSource); err != nil {
                         // Do not error if image metadata directory doesn't exist.
                         if !os.IsNotExist(err) {
                                 return fmt.Errorf("uploading image metadata: %v", err)
                         }
                 } else {
                         logger.Infof("custom image metadata uploaded")
                 }
         }
         // TODO (wallyworld): 2013-09-20 bug 1227931
@@ skipping 57 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()
 }