Merge lp:~wallyworld/juju-core/deprecated-tools-url-value into lp:~go-bot/juju-core/trunk

[Ian Booth]

Change the default (deprecated) tools-url value from omit to "" to prevent errors in some situations.

Change the default (deprecated) tools-url value from omit to "" to prevent errors in some situations.

[Ian Booth (wallyworld)]

review: Approve

=== modified file 'environs/config/config.go'
--- environs/config/config.go	2013-11-11 02:01:53 +0000
+++ environs/config/config.go	2013-11-13 00:46:50 +0000
@@ -540,7 +540,7 @@
 	"logging-config":       schema.Omit,
 
 	// Deprecated fields, retain for backwards compatibility.
-	"tools-url": schema.Omit,
+	"tools-url": "",
 
 	// For backward compatibility reasons, the following
 	// attributes default to empty strings rather than being

=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2013-11-11 02:01:53 +0000
+++ environs/config/config_test.go	2013-11-13 00:46:50 +0000
@@ -776,8 +776,9 @@
 		c.Assert(urlPresent, jc.IsFalse)
 		c.Assert(deprecatedURLPresent, jc.IsFalse)
 	}
-	_, urlPresent = cfg.AllAttrs()["tools-url"]
-	c.Assert(urlPresent, jc.IsFalse)
+	if v, ok := cfg.AllAttrs()["tools-url"]; ok {
+		c.Assert(v, gc.Equals, "")
+	}
 }
 
 func (s *ConfigSuite) TestConfigAttrs(c *gc.C) {
@@ -807,6 +808,7 @@
 	attrs["ca-private-key"] = ""
 	attrs["image-metadata-url"] = ""
 	attrs["tools-metadata-url"] = ""
+	attrs["tools-url"] = ""
 	attrs["logging-config"] = "<root>=DEBUG"
 	// Default firewall mode is instance
 	attrs["firewall-mode"] = string(config.FwInstance)