Remove control-bucket from environmnts.yaml

cmd/juju/bootstrap.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "fmt"
         "os"
         "strings"
 
@@ skipping 86 matching lines @@
                         err = environ.SetConfig(cfg)
                 }
                 if err != nil {
                         return fmt.Errorf("failed to update environment configuration: %v", err)
                 }
         }
         err = c.ensureToolsAvailability(environ, context)
         if err != nil {
                 return err
         }
-        return environs.Bootstrap(environ, c.Constraints)
+        err = environs.Bootstrap(environ, c.Constraints)
+        if err != nil {
+                return err
+        }
+        // Write out local state, if any, and if not already written.

[rog, 2013/08/06 13:55:39]

I don't know if writing "if not already written" is the right
thing to do here. Isn't it possible that a provider may
want to write out attributes specific to a particular
instantiated environment that might not be the
same the next time we bootstrap that environment?

I'm wondering what the down side is of just writing
the local state on bootstrap, regardless of whether
it already exists.

What do you think?

[wallyworld, 2013/08/07 08:02:27]

I originally wrote it out all the time but then you said not to I think.
Once the local config is generated, it should not change the next time the env
is bootstrapped, because the control bucket etc is only generated once. There's
no harm in writing it out every time, so I'll do that.

+        if lc, ok := environ.Provider().(config.HasLocalConfig); ok {
+                if _, err = config.ReadLocalConfig(environ.Config().Name()); err == nil {

[rog, 2013/08/06 13:55:39]

s/=/:=/

+                        return nil
+                }
+                localAttrs := lc.LocalAttrs(environ.Config())
+                if len(localAttrs) > 0 {
+                        ls := config.NewLocalConfig(localAttrs)
+                        err = config.WriteLocalConfig(environ.Config().Name(), ls)

[rog, 2013/08/06 13:55:39]

s/=/:=/

[wallyworld, 2013/08/07 08:02:27]

Done.

+                        if err != nil {
+                                return fmt.Errorf("bootstrap succeeded but local state could not be written: %v", err)
+                        }
+                }
+        }
+        return nil
 }
 
 // ensureToolsAvailability verifies the tools are available. If no tools are
 // found, it will automatically synchronize them.
 func (c *BootstrapCommand) ensureToolsAvailability(env environs.Environ, ctx *cmd.Context) error {
         // Capture possible logging while syncing and write it on the screen.
         loggo.RegisterWriter("bootstrap", sync.NewSyncLogWriter(ctx.Stdout, ctx.Stderr), loggo.INFO)
         defer loggo.RemoveWriter("bootstrap")
 
         // Try to find bootstrap tools.
@@ skipping 39 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()
 }