Code review comment for lp:~axwalk/juju-core/lp1216770-azure-public-storage-defaults

Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+182047_code.launchpad.net,

Message:
Please take a look.

Description:
azure: set defaults for public storage

Set default configuration values for public storage.
     public-storage-account-name: jujutools
     public-storage-container-name: juju-tools

Fixes bug #1216770

https://code.launchpad.net/~axwalk/juju-core/lp1216770-azure-public-storage-defaults/+merge/182047

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13221043/

Affected files:
   A [revision details]
   M provider/azure/config.go
   M provider/azure/config_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130825140921-3o6xvqsc01lf9v7q
+New revision: <email address hidden>

Index: provider/azure/config.go
=== modified file 'provider/azure/config.go'
--- provider/azure/config.go 2013-08-09 10:05:33 +0000
+++ provider/azure/config.go 2013-08-26 07:15:46 +0000
@@ -26,8 +26,8 @@
   "location": "",
   "management-certificate": "",
   "management-certificate-path": "",
- "public-storage-account-name": "",
- "public-storage-container-name": "",
+ "public-storage-account-name": "jujutools",
+ "public-storage-container-name": "juju-tools",
   // The default is blank, which means "use the first of the base URLs
   // that has a matching image." The first base URL is for "released",
   // which is what we want, but also a blank default will be easier on
@@ -136,8 +136,8 @@
    storage-account-name: ghedlkjhw54e
    # Public Storage info (account name and container name) denoting a public
    # container holding the juju tools.
- # public-storage-account-name: public-storage-account
- # public-storage-container-name: public-storage-container-name
+ # public-storage-account-name: jujutools
+ # public-storage-container-name: juju-tools
    # Override OS image selection with a fixed image for all deployments.
    # Most useful for developers.
    # force-image-name:
b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-13_10-amd64-server-DEVELOPMENT-20130713-Juju_ALPHA-en-us-30GB

Index: provider/azure/config_test.go
=== modified file 'provider/azure/config_test.go'
--- provider/azure/config_test.go 2013-08-22 03:50:16 +0000
+++ provider/azure/config_test.go 2013-08-26 07:15:46 +0000
@@ -229,3 +229,17 @@
   }
   c.Check(secretAttrs, gc.DeepEquals, expectedAttrs)
  }
+
+func (*configSuite) TestConfigDefaults(c *gc.C) {
+ configMap := makeAzureConfigMap(c)
+ delete(configMap, "public-storage-account-name")
+ delete(configMap, "public-storage-container-name")
+ config, err := config.New(configMap)
+ c.Assert(err, gc.IsNil)
+ provider := azureEnvironProvider{}
+ config, err = provider.Validate(config, nil)
+ c.Assert(err, gc.IsNil)
+ attrs := config.AllAttrs()
+ c.Assert(attrs["public-storage-account-name"], gc.Equals, "jujutools")
+ c.Assert(attrs["public-storage-container-name"], gc.Equals, "juju-tools")
+}

« Back to merge proposal