lp:~franciscosouza/pyjuju/juju-vpc

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:pyjuju

Juju Engineering: Pending requested 2012-11-13

Diff: 1999 lines (+752/-174)

46 files modified

juju/charm/repository.py (+3/-3)
juju/lib/http_client.py (+74/-0)
juju/machine/__init__.py (+2/-1)
juju/machine/tests/data/test_get_container (+1/-1)
juju/machine/tests/test_unit_deployment.py (+71/-1)
juju/machine/unit.py (+35/-15)
juju/providers/common/cloudinit.py (+35/-13)
juju/providers/common/launch.py (+10/-0)
juju/providers/common/tests/data/cloud_init_bootstrap (+2/-2)
juju/providers/common/tests/data/cloud_init_bootstrap_extra_env (+69/-0)
juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers (+2/-2)
juju/providers/common/tests/data/cloud_init_branch (+1/-1)
juju/providers/common/tests/data/cloud_init_branch_trunk (+1/-1)
juju/providers/common/tests/data/cloud_init_distro (+1/-2)
juju/providers/common/tests/data/cloud_init_image (+35/-0)
juju/providers/common/tests/data/cloud_init_image_extra_env (+39/-0)
juju/providers/common/tests/data/cloud_init_no_machine_id (+2/-2)
juju/providers/common/tests/data/cloud_init_normal (+2/-2)
juju/providers/common/tests/data/cloud_init_ppa (+2/-2)
juju/providers/common/tests/data/cloud_init_ppa_apt_proxy (+2/-2)
juju/providers/common/tests/data/cloud_init_proposed (+1/-1)
juju/providers/common/tests/test_cloudinit.py (+36/-0)
juju/providers/ec2/__init__.py (+3/-2)
juju/providers/ec2/launch.py (+34/-18)
juju/providers/ec2/machine.py (+7/-3)
juju/providers/ec2/securitygroup.py (+36/-20)
juju/providers/ec2/tests/common.py (+13/-12)
juju/providers/ec2/tests/data/bootstrap_cloud_init (+2/-2)
juju/providers/ec2/tests/data/launch_cloud_init (+1/-1)
juju/providers/ec2/tests/data/launch_cloud_init_branch (+1/-1)
juju/providers/ec2/tests/data/launch_cloud_init_ip_address (+35/-0)
juju/providers/ec2/tests/data/launch_cloud_init_ppa (+1/-1)
juju/providers/ec2/tests/test_bootstrap.py (+3/-3)
juju/providers/ec2/tests/test_launch.py (+63/-26)
juju/providers/ec2/tests/test_machine.py (+18/-1)
juju/providers/ec2/tests/test_securitygroup.py (+39/-10)
juju/providers/ec2/tests/test_shutdown.py (+15/-10)
juju/providers/ec2/utils.py (+2/-2)
juju/providers/local/files.py (+2/-2)
juju/providers/orchestra/files.py (+2/-2)
juju/providers/orchestra/tests/data/bootstrap_user_data (+2/-2)
juju/providers/orchestra/tests/data/launch_user_data (+1/-1)
juju/unit/address.py (+13/-2)
juju/unit/charm.py (+2/-2)
juju/unit/deploy.py (+5/-0)
juju/unit/tests/test_address.py (+26/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

625. By Francisco Souza on 2012-11-23

unit/deploy: set JUJU_PRIVATE on service upstart file

624. By Francisco Souza on 2012-11-23

providers, unit: added private mode for address

A VPC instance does not have public DNS name, so the metadata url for this data
returns 404.

623. By Francisco Souza on 2012-11-23

lib/http_client: fix stupid error

622. By Francisco Souza on 2012-11-23

lib/http_client: don't use proxy to connect to localhost, 127.0.0.1 and 169.254.169.254

621. By Francisco Souza on 2012-11-23

all: use download_page and get_page from lib.http_client

620. By Francisco Souza on 2012-11-23

lib: added http_client

This will wrap getPage and downloadPage from twisted, enabling proxy.

619. By Francisco Souza on 2012-11-23

providers/common: set extra environment on provision agent too

618. By Francisco Souza on 2012-11-23

unit/deploy: read http_proxy and https_proxy from os environment

These values are used to add new units, setting http_proxy and https_proxy in
upstart config file.

617. By Francisco Souza on 2012-11-23

providers/common: launching vms with http and https proxy in upstart file

616. By Francisco Souza on 2012-11-23

machine: added support for extra environment variables in unit deployment