|
providers/ec2: support VPC
To use VPC, all the user need to do is add two new environment settings: vpc_id
and subnet_id.
This CL depends on three other CLs (related to txaws):
- https://codereview.appspot.com/6826065/
- https://codereview.appspot.com/6822097/
- https://codereview.appspot.com/6814123/
** NOT FOR MERGE **
https://code.launchpad.net/~franciscosouza/juju/juju-vpc/+merge/134169
(do not edit description out of merge proposal)
Total comments: 3
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+754 lines, -174 lines) |
Patch |
 |
A |
[revision details]
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
13
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/charm/repository.py
|
View
|
1
2
3
4
5
6
7
8
9
|
4 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
A |
juju/lib/http_client.py
|
View
|
1
2
3
4
5
6
7
8
9
10
11
|
1 chunk |
+74 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/machine/__init__.py
|
View
|
1
2
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
juju/machine/tests/data/test_get_container
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/machine/tests/test_unit_deployment.py
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+71 lines, -1 line |
0 comments
|
Download
|
 |
M |
juju/machine/unit.py
|
View
|
1
2
3
4
5
6
7
|
9 chunks |
+35 lines, -15 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/cloudinit.py
|
View
|
1
2
3
4
5
6
7
8
|
10 chunks |
+35 lines, -13 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/launch.py
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_bootstrap
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A |
juju/providers/common/tests/data/cloud_init_bootstrap_extra_env
|
View
|
1
2
3
4
5
6
7
8
|
1 chunk |
+69 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_branch
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_branch_trunk
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_distro
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
 |
A |
juju/providers/common/tests/data/cloud_init_image
|
View
|
1
2
3
4
5
|
1 chunk |
+35 lines, -0 lines |
0 comments
|
Download
|
 |
A |
juju/providers/common/tests/data/cloud_init_image_extra_env
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_no_machine_id
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_normal
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_ppa
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_ppa_apt_proxy
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/data/cloud_init_proposed
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/common/tests/test_cloudinit.py
|
View
|
1
2
3
4
5
6
7
8
|
4 chunks |
+36 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/__init__.py
|
View
|
1
2
3
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/launch.py
|
View
|
|
3 chunks |
+34 lines, -18 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/machine.py
|
View
|
1
2
3
|
1 chunk |
+7 lines, -3 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/securitygroup.py
|
View
|
1
2
3
4
5
6
|
5 chunks |
+36 lines, -20 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/common.py
|
View
|
1
2
3
|
3 chunks |
+13 lines, -12 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/data/bootstrap_cloud_init
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/data/launch_cloud_init
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/data/launch_cloud_init_branch
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A |
juju/providers/ec2/tests/data/launch_cloud_init_ip_address
|
View
|
1
2
|
1 chunk |
+35 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/data/launch_cloud_init_ppa
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/test_bootstrap.py
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/test_launch.py
|
View
|
1
2
|
12 chunks |
+63 lines, -26 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/test_machine.py
|
View
|
1
2
3
|
2 chunks |
+18 lines, -1 line |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/test_securitygroup.py
|
View
|
1
2
3
4
|
9 chunks |
+39 lines, -10 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/tests/test_shutdown.py
|
View
|
1
2
3
4
|
5 chunks |
+15 lines, -10 lines |
0 comments
|
Download
|
 |
M |
juju/providers/ec2/utils.py
|
View
|
1
2
3
4
5
6
7
8
9
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/local/files.py
|
View
|
1
2
3
4
5
6
7
8
9
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/orchestra/files.py
|
View
|
1
2
3
4
5
6
7
8
9
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/orchestra/tests/data/bootstrap_user_data
|
View
|
1
2
3
4
5
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/providers/orchestra/tests/data/launch_user_data
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
juju/unit/address.py
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
4 chunks |
+13 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/unit/charm.py
|
View
|
1
2
3
4
5
6
7
8
9
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
juju/unit/deploy.py
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
13
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
juju/unit/tests/test_address.py
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
3 chunks |
+26 lines, -0 lines |
0 comments
|
Download
|
Total messages: 18
|