Merge lp:~sinzui/juju-quickstart/all-regions into lp:juju-quickstart

Proposed by Curtis Hovey
Status: Merged
Approved by: Madison Scott-Clary
Approved revision: 142
Merged at revision: 141
Proposed branch: lp:~sinzui/juju-quickstart/all-regions
Merge into: lp:juju-quickstart
Diff against target: 31 lines (+7/-1)
1 file modified
quickstart/models/envs.py (+7/-1)
To merge this branch: bzr merge lp:~sinzui/juju-quickstart/all-regions
Reviewer Review Type Date Requested Status
Madison Scott-Clary (community) code Approve
Review via email: mp+268961@code.launchpad.net

Commit message

Juju supports all Joyent SDCs.

Description of the change

Add the missing Joyent data centers.
Correct one data center name, Amsterdam is still un Europe.
Add comments pointing to where regions are defined.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

make test, all passed.

Revision history for this message
Madison Scott-Clary (makyo) wrote :

Awesome, thanks for the update. LGTM

review: Approve (code)
Revision history for this message
Madison Scott-Clary (makyo) wrote :

*** Submitted:

Add the missing Joyent data centers.

Correct one data center name, Amsterdam is still un Europe.
Add comments pointing to where regions are defined.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'quickstart/models/envs.py'
2--- quickstart/models/envs.py 2015-05-05 14:45:40 +0000
3+++ quickstart/models/envs.py 2015-08-24 18:42:13 +0000
4@@ -423,6 +423,8 @@
5 'eu-central-1', 'eu-west-1', 'sa-east-1',
6 'us-east-1', 'us-west-1', 'us-west-2',
7 )
8+ # https://community.hpcloud.com/article/
9+ # command-line-interface-cli-tool-installation-instructions
10 hp_regions = ('region-a.geo-1', 'region-b.geo-1')
11
12 # The Azure locations are listed at:
13@@ -448,13 +450,17 @@
14 )
15
16 # The first URL is used as the default one.
17+ # https://docs.joyent.com/public-cloud/api-access/cloudapi
18 joyent_sdc_urls = (
19 'https://us-west-1.api.joyentcloud.com',
20 'https://us-east-1.api.joyentcloud.com',
21+ 'https://us-east-2.api.joyentcloud.com',
22+ 'https://us-east-3.api.joyentcloud.com',
23 'https://us-sw-1.api.joyentcloud.com',
24- 'https://us-ams-1.api.joyentcloud.com',
25+ 'https://eu-ams-1.api.joyentcloud.com',
26 )
27 # The first is the default.
28+ # https://cloud.google.com/compute/docs/zones
29 gce_regions = (
30 'us-central1',
31 'europe-west1',

Subscribers

People subscribed via source and target branches

to all changes: