In local environments, by default, don't run OS updates/upgrades.

kat-co · kat-co · commit 285999421f74 · 2014-08-27T16:39:49.000-05:00
diff --git a/environs/cloudinit/cloudinit.go b/environs/cloudinit/cloudinit.go
@@ -189,13 +189,17 @@ func AddAptCommands(
 	c.SetAptUpgrade(addUpgradeScripts)
 	c.SetAptGetWrapper("eatmydata")
 
-	c.AddPackage("curl")
-	c.AddPackage("cpu-checker")
-	// TODO(axw) 2014-07-02 #1277359
-	// Don't install bridge-utils in cloud-init;
-	// leave it to the networker worker.
-	c.AddPackage("bridge-utils")
-	c.AddPackage("rsyslog-gnutls")
+	// If we're not doing an update, adding these packages is
+	// meaningless.
+	if addUpdateScripts {
+		c.AddPackage("curl")
+		c.AddPackage("cpu-checker")
+		// TODO(axw) 2014-07-02 #1277359
+		// Don't install bridge-utils in cloud-init;
+		// leave it to the networker worker.
+		c.AddPackage("bridge-utils")
+		c.AddPackage("rsyslog-gnutls")
+	}
 
 	// Write out the apt proxy settings
 	if (proxySettings != proxy.Settings{}) {
diff --git a/provider/local/environ.go b/provider/local/environ.go
@@ -106,7 +106,10 @@ func ensureNotRoot() error {
 }
 
 // Bootstrap is specified in the Environ interface.
-func (env *localEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) (arch, series string, _ environs.BootstrapFinalizer, _ error) {
+func (env *localEnviron) Bootstrap(
+	ctx environs.BootstrapContext,
+	args environs.BootstrapParams,
+) (arch, series string, _ environs.BootstrapFinalizer, _ error) {
 	if err := ensureNotRoot(); err != nil {
 		return "", "", nil, err
 	}
@@ -120,10 +123,24 @@ func (env *localEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.
 		return "", "", nil, err
 	}
 
-	// Record the bootstrap IP, so the containers know where to go for storage.
-	cfg, err := env.Config().Apply(map[string]interface{}{
+	configAttrs := env.Config().AllAttrs()
+	toApply := map[string]interface{}{
+		// Record the bootstrap IP, so the containers know where to go for storage.
 		"bootstrap-ip": env.bridgeAddress,
-	})
+	}
+
+	setIfNot := func(key string, value interface{}) {
+		if _, ok := configAttrs[key]; !ok {
+			toApply[key] = value
+		}
+	}
+
+	// Since Juju's state machine is currently the host machine
+	// for local providers, don't stomp on it.
+	setIfNot("enable-os-refresh-update", false)
+	setIfNot("enable-os-upgrade", false)
+
+	cfg, err := env.Config().Apply(toApply)
 	if err == nil {
 		err = env.SetConfig(cfg)
 	}
diff --git a/provider/local/environ_test.go b/provider/local/environ_test.go
@@ -195,8 +195,8 @@ func (s *localJujuTestSuite) testBootstrap(c *gc.C, cfg *config.Config) environs
 func (s *localJujuTestSuite) TestBootstrap(c *gc.C) {
 
 	mockFinish := func(ctx environs.BootstrapContext, mcfg *cloudinit.MachineConfig, cloudcfg *coreCloudinit.Config) error {
-		c.Assert(cloudcfg.AptUpdate(), jc.IsTrue)
-		c.Assert(cloudcfg.AptUpgrade(), jc.IsTrue)
+		c.Assert(cloudcfg.AptUpdate(), gc.Equals, mcfg.EnableOSRefreshUpdate)
+		c.Assert(cloudcfg.AptUpgrade(), gc.Equals, mcfg.EnableOSUpgrade)
 		if !mcfg.EnableOSRefreshUpdate {
 			c.Assert(cloudcfg.Packages(), gc.HasLen, 0)
 		}
@@ -206,7 +206,18 @@ func (s *localJujuTestSuite) TestBootstrap(c *gc.C) {
 		return nil
 	}
 	s.PatchValue(local.ExecuteCloudConfig, mockFinish)
-	s.testBootstrap(c, minimalConfig(c))
+
+	// Test that defaults are correct.
+	minCfg := minimalConfig(c)
+	s.testBootstrap(c, minCfg)
+
+	// Test that overrides work.
+	minCfg, err := minCfg.Apply(map[string]interface{}{
+		"enable-os-refresh-update": true,
+		"enable-os-upgrade":        true,
+	})
+	c.Assert(err, gc.IsNil)
+	s.testBootstrap(c, minCfg)
 }
 
 func (s *localJujuTestSuite) TestDestroy(c *gc.C) {
