juju-core

Merge lp:~axwalk/juju-core/lp1216770-azure-public-storage-defaults into lp:~go-bot/juju-core/trunk

  1. lp1216770-azure-public-storage-defaults
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 1714
Proposed branch: lp:~axwalk/juju-core/lp1216770-azure-public-storage-defaults
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 56 lines (+24/-7)
2 files modified
provider/azure/config.go (+10/-7)
provider/azure/config_test.go (+14/-0)
To merge this branch: bzr merge lp:~axwalk/juju-core/lp1216770-azure-public-storage-defaults
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+182047@code.launchpad.net

Commit message

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://codereview.appspot.com/13221043/

Description of the change

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://codereview.appspot.com/13221043/

To post a comment you must log in.
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")
+}

Revision history for this message
John A Meinel (jameinel) wrote :

LGTM

https://codereview.appspot.com/13221043/

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

Please take a look.

https://codereview.appspot.com/13221043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'provider/azure/config.go'
2--- provider/azure/config.go 2013-08-09 10:05:33 +0000
3+++ provider/azure/config.go 2013-08-26 23:30:36 +0000
4@@ -23,11 +23,14 @@
5 "force-image-name": schema.String(),
6 }
7 var configDefaults = schema.Defaults{
8- "location": "",
9- "management-certificate": "",
10- "management-certificate-path": "",
11- "public-storage-account-name": "",
12- "public-storage-container-name": "",
13+ "location": "",
14+ "management-certificate": "",
15+ "management-certificate-path": "",
16+ // The default account/container expands to the following base URL:
17+ // https://jujutools.blob.core.windows.net/juju-tools
18+ // (append "/tools%2Fjuju-$version-$series-$arch.tgz" for a tools archive.)
19+ "public-storage-account-name": "jujutools",
20+ "public-storage-container-name": "juju-tools",
21 // The default is blank, which means "use the first of the base URLs
22 // that has a matching image." The first base URL is for "released",
23 // which is what we want, but also a blank default will be easier on
24@@ -136,8 +139,8 @@
25 storage-account-name: ghedlkjhw54e
26 # Public Storage info (account name and container name) denoting a public
27 # container holding the juju tools.
28- # public-storage-account-name: public-storage-account
29- # public-storage-container-name: public-storage-container-name
30+ # public-storage-account-name: jujutools
31+ # public-storage-container-name: juju-tools
32 # Override OS image selection with a fixed image for all deployments.
33 # Most useful for developers.
34 # force-image-name: b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-13_10-amd64-server-DEVELOPMENT-20130713-Juju_ALPHA-en-us-30GB
35
36=== modified file 'provider/azure/config_test.go'
37--- provider/azure/config_test.go 2013-08-22 03:50:16 +0000
38+++ provider/azure/config_test.go 2013-08-26 23:30:36 +0000
39@@ -229,3 +229,17 @@
40 }
41 c.Check(secretAttrs, gc.DeepEquals, expectedAttrs)
42 }
43+
44+func (*configSuite) TestConfigDefaults(c *gc.C) {
45+ configMap := makeAzureConfigMap(c)
46+ delete(configMap, "public-storage-account-name")
47+ delete(configMap, "public-storage-container-name")
48+ config, err := config.New(configMap)
49+ c.Assert(err, gc.IsNil)
50+ provider := azureEnvironProvider{}
51+ config, err = provider.Validate(config, nil)
52+ c.Assert(err, gc.IsNil)
53+ attrs := config.AllAttrs()
54+ c.Assert(attrs["public-storage-account-name"], gc.Equals, "jujutools")
55+ c.Assert(attrs["public-storage-container-name"], gc.Equals, "juju-tools")
56+}

Subscribers

People subscribed via source and target branches

to status/vote changes: