Merge lp:~franciscosouza/pyjuju/juju-vpc into lp:pyjuju

[Francisco Souza]

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

[Chico (franciscossouza)]

Reviewers: mp+134169_code.launchpad.net,

Message:
Please take a look.

Description:
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/

https://code.launchpad.net/~franciscosouza/juju/juju-vpc/+merge/134169

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M juju/providers/ec2/launch.py
   M juju/providers/ec2/securitygroup.py
   M juju/providers/ec2/tests/common.py
   M juju/providers/ec2/tests/test_bootstrap.py
   M juju/providers/ec2/tests/test_launch.py
   M juju/providers/ec2/tests/test_securitygroup.py
   M juju/providers/ec2/tests/test_shutdown.py

[lp:~franciscosouza/pyjuju/juju-vpc]

605. By Francisco Souza on 2012-11-13

provides/ec2: removed unused import

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

606. By Francisco Souza on 2012-11-14

providers/ec2: record machine private_ip_address (for VPC)

607. By Francisco Souza on 2012-11-14

machine: support private_ip_address

608. By Francisco Souza on 2012-11-14

providers/common: added private mode to cloudinit

In private mode, it uses private_ip_address for zookeeper.

609. By Francisco Souza on 2012-11-14

providers/common: use cloudinit's private mode

610. By Francisco Souza on 2012-11-14

providers/ec2: update launch with subnet to work in private mode

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

611. By Francisco Souza on 2012-11-21

providers/ec2: added private mode

Also adapt to new txaws api.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

612. By Francisco Souza on 2012-11-21

providers/ec2: don't use group_name on describe_security_groups

I know that sucks, but we need a better solution later.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

613. By Francisco Souza on 2012-11-22

cloudinit: added image source

This source should be used when juju comes pre-installed in the machine image.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[Kapil Thangavelu (hazmat)]

one comment regarding correctness.

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py
File juju/providers/ec2/securitygroup.py (right):

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py#newcode11
juju/providers/ec2/securitygroup.py:11: for group in d.result:
This is very suspect, deferred results should not be access directly,
this needs a callback registered or inlineCallbacks syntax.

https://codereview.appspot.com/6850044/

[Chico (franciscossouza)]

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py
File juju/providers/ec2/securitygroup.py (right):

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py#newcode11
juju/providers/ec2/securitygroup.py:11: for group in d.result:
On 2012/11/22 13:44:07, hazmat wrote:
> This is very suspect, deferred results should not be access directly,
this needs
> a callback registered or inlineCallbacks syntax.

Thanks, I will fix this.

I will also stop updating this CL using lbox, so you guys stop receiving
notifications. There is more than VPC in this CL now (proxy,
pre-installed juju, etc.), and we will probably keep using this fork. I
hope that we will be able to send smaller patchs for merging in the
(near) future.

https://codereview.appspot.com/6850044/

[Kapil Thangavelu (hazmat)]

no worries about using lbox, i don't mind having a look on occasion, i
understood from the merge proposal that it wasn't intended for merge. i've
been going through the txaws branches as well, which look good but i'll
need to rope in one more reviewer for them i think. i'd like to get some
additional functionality there for txaws to be able to create vpc, with a
goal that juju can create the vpc itself. cheers.

On Thu, Nov 22, 2012 at 8:58 AM, <email address hidden> wrote:

>
> https://codereview.appspot.**com/6850044/diff/7017/juju/**
> providers/ec2/securitygroup.py<https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py>
> File juju/providers/ec2/**securitygroup.py (right):
>
> https://codereview.appspot.**com/6850044/diff/7017/juju/**
> providers/ec2/securitygroup.**py#newcode11<https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py#newcode11>
> juju/providers/ec2/**securitygroup.py:11: for group in d.result:
> On 2012/11/22 13:44:07, hazmat wrote:
>
>> This is very suspect, deferred results should not be access directly,
>>
> this needs
>
>> a callback registered or inlineCallbacks syntax.
>>
>
> Thanks, I will fix this.
>
> I will also stop updating this CL using lbox, so you guys stop receiving
> notifications. There is more than VPC in this CL now (proxy,
> pre-installed juju, etc.), and we will probably keep using this fork. I
> hope that we will be able to send smaller patchs for merging in the
> (near) future.
>
> https://codereview.appspot.**com/6850044/<https://codereview.appspot.com/6850044/>
>

[Chico (franciscossouza)]

On 2012/11/22 14:26:33, hazmat wrote:
> no worries about using lbox, i don't mind having a look on occasion, i
> understood from the merge proposal that it wasn't intended for merge.
i've
> been going through the txaws branches as well, which look good but
i'll
> need to rope in one more reviewer for them i think. i'd like to get
some
> additional functionality there for txaws to be able to create vpc,
with a
> goal that juju can create the vpc itself. cheers.

Indeed. txaws branches are there for merging, I think they're quite
there. Are you able to review and merge them? I'd like to move forward
in getting those branches merged.

Regards,
Francisco

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

614. By Francisco Souza on 2012-11-22

providers/ec2: don't use deferred.result

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py
File juju/providers/ec2/securitygroup.py (right):

https://codereview.appspot.com/6850044/diff/7017/juju/providers/ec2/securitygroup.py#newcode11
juju/providers/ec2/securitygroup.py:11: for group in d.result:
On 2012/11/22 13:44:07, hazmat wrote:
> This is very suspect, deferred results should not be access directly,
this needs
> a callback registered or inlineCallbacks syntax.

Done.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

615. By Francisco Souza on 2012-11-23

providers/common: added extra environment support for cloud init

616. By Francisco Souza on 2012-11-23

machine: added support for extra environment variables in unit deployment

617. By Francisco Souza on 2012-11-23

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

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.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

619. By Francisco Souza on 2012-11-23

providers/common: set extra environment on provision agent too

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

620. By Francisco Souza on 2012-11-23

lib: added http_client

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

621. By Francisco Souza on 2012-11-23

all: use download_page and get_page from lib.http_client

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

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

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

623. By Francisco Souza on 2012-11-23

lib/http_client: fix stupid error

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

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.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

[lp:~franciscosouza/pyjuju/juju-vpc]

625. By Francisco Souza on 2012-11-23

unit/deploy: set JUJU_PRIVATE on service upstart file

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6850044/

Unmerged revisions

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

=== modified file 'juju/charm/repository.py'
--- juju/charm/repository.py	2012-08-23 23:57:09 +0000
+++ juju/charm/repository.py	2012-11-23 21:00:27 +0000
@@ -7,7 +7,6 @@
 import yaml
 
 from twisted.internet.defer import fail, inlineCallbacks, returnValue, succeed
-from twisted.web.client import downloadPage, getPage
 from twisted.web.error import Error
 from txaws.client.ssl import VerifyingContextFactory
 
@@ -15,6 +14,7 @@
 from juju.charm.url import CharmURL
 from juju.errors import FileNotFound
 from juju.lib import under
+from juju.lib.http_client import download_page, get_page
 
 from .errors import (
     CharmNotFound, CharmError, RepositoryNotFound, ServiceConfigValueError)
@@ -129,7 +129,7 @@
             self.url_base, urllib.quote(charm_id))
         try:
             host = urlparse.urlparse(url).hostname
-            all_info = json.loads((yield getPage(url, contextFactory=VerifyingContextFactory(host))))
+            all_info = json.loads((yield get_page(url, contextFactory=VerifyingContextFactory(host))))
             charm_info = all_info[charm_id]
             for warning in charm_info.get("warnings", []):
                 log.warning("%s: %s", charm_id, warning)
@@ -152,7 +152,7 @@
         downloading_path = f.name
         host = urlparse.urlparse(url).hostname
         try:
-            yield downloadPage(url, downloading_path, contextFactory=VerifyingContextFactory(host))
+            yield download_page(url, downloading_path, contextFactory=VerifyingContextFactory(host))
         except Error:
             raise CharmNotFound(self.url_base, charm_url)
         os.rename(downloading_path, cache_path)
 
=== added file 'juju/lib/http_client.py'
--- juju/lib/http_client.py	1970-01-01 00:00:00 +0000
+++ juju/lib/http_client.py	2012-11-23 21:00:27 +0000
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+import os
+import urlparse
+
+from twisted.internet import reactor
+from twisted.internet.defer import Deferred
+from twisted.internet.endpoints import TCP4ClientEndpoint
+from twisted.internet.protocol import connectionDone, Protocol
+from twisted.web.client import downloadPage, getPage, ProxyAgent, ResponseDone
+from twisted.web.http import PotentialDataLoss
+
+
+class Receiver(Protocol):
+    finished = None
+    _filename = None
+
+    def __init__(self, filename=None):
+        self.received = ""
+        if filename:
+            self._filename = filename
+
+    def dataReceived(self, data):
+        self.received += data
+
+    def connectionLost(self, reason=connectionDone):
+        reason.trap(ResponseDone, PotentialDataLoss, connectionDone)
+        d = self.finished
+        self.finished = None
+        if self._filename:
+            file = open(self._filename, "w")
+            try:
+                file.write(self.received)
+            finally:
+                file.close()
+        d.callback(self.received)
+
+
+def response_saver(path):
+    def save_response(response):
+        receiver = Receiver(path)
+        receiver.finished = d = Deferred()
+        response.deliverBody(receiver)
+        return d
+    return save_response
+
+
+def _deferred_get(url, proxy_endpoint):
+    proxy_url = urlparse.urlparse(proxy_endpoint)
+    endpoint = TCP4ClientEndpoint(reactor, proxy_url.hostname, proxy_url.port)
+    agent = ProxyAgent(endpoint)
+    return agent.request("GET", url)
+
+
+def download_page(url, path, *args, **kwargs):
+    host = urlparse.urlparse(url).hostname
+    proxy_var = url.startswith("https://") and "https_proxy" or "http_proxy"
+    proxy_endpoint = os.environ.get(proxy_var)
+    if proxy_endpoint and host not in ("localhost", "127.0.0.1", "169.254.169.254"):
+        d = _deferred_get(url, proxy_endpoint)
+        d.addCallback(response_saver(path))
+        return d
+    return downloadPage(url, path, *args, **kwargs)
+
+
+def get_page(url, *args, **kwargs):
+    host = urlparse.urlparse(url).hostname
+    proxy_var = url.startswith("https://") and "https_proxy" or "http_proxy"
+    proxy_endpoint = os.environ.get(proxy_var)
+    if proxy_endpoint and host not in ("localhost", "127.0.0.1", "169.254.169.254"):
+        d = _deferred_get(url, proxy_endpoint)
+        d.addCallback(response_saver(None))
+        return d
+    else:
+        return getPage(url, *args, **kwargs)
 
=== modified file 'juju/machine/__init__.py'
--- juju/machine/__init__.py	2012-01-31 19:57:53 +0000
+++ juju/machine/__init__.py	2012-11-23 21:00:27 +0000
@@ -9,9 +9,10 @@
     """
 
     def __init__(self, instance_id, dns_name=None, private_dns_name=None,
-                 state="unknown"):
+                 state="unknown", private_ip_address=None):
         self.instance_id = instance_id
         # ideally this would be ip_address, but txaws doesn't expose it.
         self.dns_name = dns_name
         self.private_dns_name = private_dns_name
+        self.private_ip_address = private_ip_address
         self.state = state
 
=== modified file 'juju/machine/tests/data/test_get_container'
--- juju/machine/tests/data/test_get_container	2012-10-09 18:55:55 +0000
+++ juju/machine/tests/data/test_get_container	2012-11-23 21:00:27 +0000
@@ -7,7 +7,7 @@
 machine-data: {juju-provider-type: null, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: null}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, python-txaws]
 runcmd: [sudo apt-get install -y python-txzookeeper, sudo mkdir -p /usr/lib/juju,
   'cd /usr/lib/juju && sudo /usr/bin/bzr co --lightweight lp:juju 
     juju', cd /usr/lib/juju/juju && sudo python setup.py develop, sudo mkdir -p /var/lib/juju,
 
=== modified file 'juju/machine/tests/test_unit_deployment.py'
--- juju/machine/tests/test_unit_deployment.py	2012-10-05 13:55:09 +0000
+++ juju/machine/tests/test_unit_deployment.py	2012-11-23 21:00:27 +0000
@@ -15,7 +15,7 @@
 from juju.lib.lxc.tests.test_lxc import uses_sudo
 from juju.lib.mocker import ANY, KWARGS, MATCH
 from juju.lib.upstart import UpstartService
-from juju.machine.unit import UnitMachineDeployment, UnitContainerDeployment
+from juju.machine.unit import ExtraEnvironmentDeployment, UnitMachineDeployment, UnitContainerDeployment
 from juju.machine.errors import UnitDeploymentError
 from juju.machine import tests
 from juju.tests.common import get_test_zookeeper_address
@@ -143,6 +143,54 @@
         d.addCallback(verify_upstart)
         return d
 
+    def test_service_unit_start_with_extra_environment(self):
+        """
+        Starting a service unit will result in a unit workspace being created
+        if it does not exist and a running service unit agent.
+        """
+        self.setup_mock()
+        self.mock_install()
+        self.mock_is_running(False)
+        self.mock_start()
+        self.mocker.replay()
+
+        self.deployment.set_env("http_proxy", "http://myproxy.com:3128/")
+        d = self.deployment.start(
+            "123", get_test_zookeeper_address(), self.bundle)
+
+        def verify_upstart(_):
+            conf_path = os.path.join(self.init_dir, "juju-wordpress-0.conf")
+            with open(conf_path) as f:
+                lines = f.readlines()
+
+            env = []
+            for line in lines:
+                if line.startswith("env "):
+                    env.append(line[4:-1].split("=", 1))
+                if line.startswith("exec "):
+                    exec_ = line[5:-1]
+
+            env = dict((k, v.strip('"')) for (k, v) in env)
+            env.pop("PYTHONPATH")
+            self.assertEquals(env, {
+                "JUJU_HOME": self.juju_directory,
+                "JUJU_UNIT_NAME": self.unit_name,
+                "JUJU_ZOOKEEPER": get_test_zookeeper_address(),
+                "JUJU_MACHINE_ID": "123",
+                "http_proxy": "http://myproxy.com:3128/"})
+
+            log_file = os.path.join(
+                self.deployment.directory, "charm.log")
+            command = " ".join([
+                "/usr/bin/python", "-m", "juju.agents.dummy", "--nodaemon",
+                "--logfile", log_file, "--session-file",
+                "/var/run/juju/unit-wordpress-0-agent.zksession",
+                ">> /tmp/juju-wordpress-0.output 2>&1"])
+            self.assertEquals(exec_, command)
+        d.addCallback(verify_upstart)
+        self.deployment.unset_env("http_proxy")
+        return d
+
     @inlineCallbacks
     def test_service_unit_destroy(self):
         """
@@ -426,3 +474,25 @@
 
         container, rootfs = yield self.unit_deploy._get_container(
             "0", cloud_init)
+
+
+class ExtraEnvironmentTest(RepositoryTestBase):
+
+    def test_set_env(self):
+        deploy = ExtraEnvironmentDeployment()
+        deploy.set_env("http_proxy", "http://myproxy.com:3128/")
+        self.assertEquals(deploy._extra_environment["http_proxy"], "http://myproxy.com:3128/")
+
+    def test_unset_env(self):
+        deploy = ExtraEnvironmentDeployment()
+        deploy.set_env("http_proxy", "http://myproxy.com:3128/")
+        deploy.unset_env("http_proxy")
+        self.assertNotIn("http_proxy", deploy._extra_environment)
+
+    def test_machine_deployment_extends_extra_environment(self):
+        assert issubclass(UnitMachineDeployment, ExtraEnvironmentDeployment), \
+            "UnitMachineDeployment should inherit from ExtraEnvironmentDeployment!"
+
+    def test_container_deployment_extends_extra_environment(self):
+        assert issubclass(UnitContainerDeployment, ExtraEnvironmentDeployment), \
+            "UnitContainerDeployment should inherit from ExtraEnvironmentDeployment!"
 
=== modified file 'juju/machine/unit.py'
--- juju/machine/unit.py	2012-09-27 00:42:32 +0000
+++ juju/machine/unit.py	2012-11-23 21:00:27 +0000
@@ -8,7 +8,7 @@
 
 from juju.charm.bundle import CharmBundle
 from juju.errors import ServiceError
-from juju.lib.lxc import LXCContainer, get_containers, LXCError
+from juju.lib.lxc import LXCContainer, get_containers
 from juju.lib.twistutils import get_module_directory
 from juju.lib.upstart import UpstartService
 from juju.providers.common.cloudinit import CloudInit
@@ -27,20 +27,33 @@
     return UnitMachineDeployment
 
 
-def _get_environment(unit_name, juju_home, machine_id, zookeeper_hosts):
-    environ = dict()
-    environ["JUJU_MACHINE_ID"] = str(machine_id)
-    environ["JUJU_UNIT_NAME"] = unit_name
-    environ["JUJU_HOME"] = juju_home
-    environ["JUJU_ZOOKEEPER"] = zookeeper_hosts
-    environ["PYTHONPATH"] = ":".join(
+def _get_environment(unit_name, juju_home, machine_id, zookeeper_hosts, base=None):
+    if not base:
+        base = {}
+    base["JUJU_MACHINE_ID"] = str(machine_id)
+    base["JUJU_UNIT_NAME"] = unit_name
+    base["JUJU_HOME"] = juju_home
+    base["JUJU_ZOOKEEPER"] = zookeeper_hosts
+    base["PYTHONPATH"] = ":".join(
         filter(None, [
             os.path.dirname(get_module_directory(juju)),
             os.environ.get("PYTHONPATH")]))
-    return environ
-
-
-class UnitMachineDeployment(object):
+    return base
+
+
+class ExtraEnvironmentDeployment(object):
+
+    def __init__(self):
+        self._extra_environment = {}
+
+    def set_env(self, name, value):
+        self._extra_environment[name] = value
+
+    def unset_env(self, name):
+        del self._extra_environment[name]
+
+
+class UnitMachineDeployment(ExtraEnvironmentDeployment):
     """ Deploy a unit directly onto a machine.
 
     A service unit deployed directly to a machine has full access
@@ -54,6 +67,7 @@
     unit_agent_module = "juju.agents.unit"
 
     def __init__(self, unit_name, juju_home):
+        super(UnitMachineDeployment, self).__init__()
         assert ".." not in unit_name, "Invalid Unit Name"
         self.unit_name = unit_name
         self.juju_home = juju_home
@@ -72,7 +86,7 @@
         self.service.set_description(
             "Juju unit agent for %s" % self.unit_name)
         self.service.set_environ(_get_environment(
-            self.unit_name, self.juju_home, machine_id, zookeeper_hosts))
+            self.unit_name, self.juju_home, machine_id, zookeeper_hosts, self._extra_environment))
         self.service.set_command(" ".join((
             "/usr/bin/python", "-m", self.unit_agent_module,
             "--nodaemon",
@@ -130,7 +144,7 @@
             "juju-%s" % self.unit_path_name, use_sudo=True)
 
 
-class UnitContainerDeployment(object):
+class UnitContainerDeployment(ExtraEnvironmentDeployment):
     """Deploy a service unit in a container.
 
     Units deployed in a container have strong isolation between
@@ -145,6 +159,7 @@
     """
 
     def __init__(self, unit_name, juju_home):
+        super(UnitContainerDeployment, self).__init__()
         self.unit_name = unit_name
         self.juju_home = juju_home
         self.unit_path_name = unit_name.replace("/", "-")
@@ -189,7 +204,7 @@
                 (zk, port) = zk.split(':')
             else:
                 port = 2181
-            zks.append((zk,port))
+            zks.append((zk, port))
 
         cloud_init.set_zookeeper_hosts(zks)
         # XXX Very hard to access the provider's notion of network
@@ -197,6 +212,9 @@
         # the apt-cacher-ng since this is meant for local provider.
         cloud_init.set_apt_proxy('http://%s:3142' % zks[0][0])
 
+        for name, value in self._extra_environment.iteritems():
+            cloud_init.set_env(name, value)
+
         if self._juju_origin:
             if self._juju_origin.startswith("lp:"):
                 cloud_init.set_juju_source(branch=self._juju_origin)
@@ -204,6 +222,8 @@
                 cloud_init.set_juju_source(ppa=True)
             elif self._juju_origin == "proposed":
                 cloud_init.set_juju_source(proposed=True)
+            elif self._juju_origin == "image":
+                cloud_init.set_juju_source(image=True)
             else:
                 # Ignore other values, just use the distro for sanity
                 cloud_init.set_juju_source(distro=True)
 
=== modified file 'juju/providers/common/cloudinit.py'
--- juju/providers/common/cloudinit.py	2012-10-09 18:55:55 +0000
+++ juju/providers/common/cloudinit.py	2012-11-23 21:00:27 +0000
@@ -13,6 +13,7 @@
 PPA = "ppa"
 BRANCH = "branch"
 PROPOSED = "proposed"
+IMAGE = "image"
 
 
 def _branch_install_scripts(branch):
@@ -45,11 +46,13 @@
            b64encode(serializer.dump(constraints.data)), provider_type)]
 
 
-def _machine_scripts(machine_id, zookeeper_hosts):
+def _machine_scripts(machine_id, zookeeper_hosts, extra_env=None):
     service = UpstartService("juju-machine-agent")
     service.set_description("Juju machine agent")
-    service.set_environ(
-        {"JUJU_MACHINE_ID": machine_id, "JUJU_ZOOKEEPER": zookeeper_hosts})
+    env = {"JUJU_MACHINE_ID": machine_id, "JUJU_ZOOKEEPER": zookeeper_hosts}
+    if extra_env:
+        env.update(extra_env)
+    service.set_environ(env)
     service.set_command(
         "python -m juju.agents.machine --nodaemon "
         "--logfile /var/log/juju/machine-agent.log "
@@ -78,10 +81,13 @@
                 "/var/run/juju/unit-%s-agent.zksession" % unit_path_name]))
     return service.get_cloud_init_commands()
 
-def _provision_scripts(zookeeper_hosts):
+def _provision_scripts(zookeeper_hosts, extra_env=None):
     service = UpstartService("juju-provision-agent")
     service.set_description("Juju provisioning agent")
-    service.set_environ({"JUJU_ZOOKEEPER": zookeeper_hosts})
+    env = {"JUJU_ZOOKEEPER": zookeeper_hosts}
+    if extra_env:
+        env.update(extra_env)
+    service.set_environ(env)
     service.set_command(
         "python -m juju.agents.provision --nodaemon "
         "--logfile /var/log/juju/provision-agent.log "
@@ -175,6 +181,8 @@
         self._unit_name = None
         self._juju_home = None
         self._apt_proxy = None
+        self._extra_environment = {}
+        self.private = False
 
     def add_ssh_key(self, key):
         """Add an SSH public key.
@@ -190,8 +198,14 @@
         self._zookeeper = True
         self._provision = True
 
+    def set_env(self, name, value):
+        self._extra_environment[name] = value
+
+    def unset_env(self, name):
+        del self._extra_environment[name]
+
     def set_juju_source(
-        self, branch=None, ppa=False, distro=False, proposed=False):
+        self, branch=None, ppa=False, distro=False, proposed=False, image=False):
         """Set the version of juju the machine should run.
 
         :param branch: location from which to check out juju; for example,
@@ -213,9 +227,12 @@
         Note that you don't need to call this method; the juju source
         defaults to what is returned by `get_default_origin`.
         """
-        if len(filter(None, (branch, ppa, distro, proposed))) != 1:
+        if len(filter(None, (branch, ppa, distro, proposed, image))) != 1:
             raise CloudInitError("Please specify one source")
-        if branch:
+        if image:
+            self._origin = IMAGE
+            self._origin_url = None
+        elif branch:
             self._origin = BRANCH
             self._origin_url = branch
         elif ppa:
@@ -282,7 +299,10 @@
         You don't have to set this, so long as the machine you are starting is
         itself a zookeeper instance.
         """
-        self._zookeeper_hosts = [m.private_dns_name for m in machines]
+        if self.private:
+            self._zookeeper_hosts = [m.private_ip_address for m in machines]
+        else:
+            self._zookeeper_hosts = [m.private_dns_name for m in machines]
 
     def set_zookeeper_hosts(self, hosts):
         """Specify master :class:`juju.machine.ProviderMachine` instances.
@@ -367,18 +387,20 @@
     def _collect_packages(self):
         packages = [
             "bzr", "byobu", "tmux", "python-setuptools", "python-twisted",
-            "python-txaws", "python-zookeeper"]
+            "python-zookeeper"]
         if self._zookeeper:
             packages.extend([
                 "default-jre-headless", "zookeeper", "zookeeperd"])
         if self._origin in (DISTRO, PPA, PROPOSED):
             packages.append("juju")
+        if self._origin != IMAGE:
+            packages.append("python-txaws")
         return packages
 
     def _collect_repositories(self):
         if self._origin == PROPOSED:
             return ["deb $MIRROR $RELEASE-proposed main universe"]
-        if self._origin != DISTRO:
+        if self._origin not in (DISTRO, IMAGE):
             return ["ppa:juju/pkgs"]
         return []
 
@@ -392,7 +414,7 @@
                 self._provider_type))
         if self._machine_id:
             scripts.extend(_machine_scripts(
-                self._machine_id, self._join_zookeeper_hosts()))
+                self._machine_id, self._join_zookeeper_hosts(), self._extra_environment))
         if self._unit_name:
             scripts.extend(_unit_scripts(
                 self._machine_id,
@@ -400,7 +422,7 @@
                 self._join_zookeeper_hosts(),
                 self._juju_home))
         if self._provision:
-            scripts.extend(_provision_scripts(self._join_zookeeper_hosts()))
+            scripts.extend(_provision_scripts(self._join_zookeeper_hosts(), self._extra_environment))
         return scripts
 
     def _collect_machine_data(self):
 
=== modified file 'juju/providers/common/launch.py'
--- juju/providers/common/launch.py	2012-07-18 20:04:16 +0000
+++ juju/providers/common/launch.py	2012-11-23 21:00:27 +0000
@@ -92,6 +92,7 @@
         """
         config = self._provider.config
         cloud_init = CloudInit()
+        cloud_init.private = config.get("vpc_id") is not None
         cloud_init.add_ssh_key(get_user_authorized_keys(config))
         cloud_init.set_machine_id(machine_id)
         cloud_init.set_zookeeper_machines(zookeepers)
@@ -103,9 +104,18 @@
                 cloud_init.set_juju_source(ppa=True)
             elif origin == "proposed":
                 cloud_init.set_juju_source(proposed=True)
+            elif origin == "image":
+                cloud_init.set_juju_source(image=True)
             else:
                 # Ignore other values, just use the distro for sanity
                 cloud_init.set_juju_source(distro=True)
+        proxy = config.get("proxy")
+        if proxy:
+            cloud_init.set_env("http_proxy", proxy)
+            cloud_init.set_env("https_proxy", proxy)
+        private = config.get("vpc_id") is not None
+        if private:
+            cloud_init.set_env("JUJU_PRIVATE", "private")
         if self._master:
             cloud_init.enable_bootstrap()
             cloud_init.set_zookeeper_secret(config["admin-secret"])
 
=== modified file 'juju/providers/common/tests/data/cloud_init_bootstrap'
--- juju/providers/common/tests/data/cloud_init_bootstrap	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/data/cloud_init_bootstrap	2012-11-23 21:00:27 +0000
@@ -4,8 +4,8 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  default-jre-headless, zookeeper, zookeeperd, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  default-jre-headless, zookeeper, zookeeperd, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'juju-admin initialize
     --instance-id=token --admin-identity=admin:19vlzY4Vc3q4Ew5OsCwKYqrq1HI= --constraints-data=e2NwdTogJzIwJywgcHJvdmlkZXItdHlwZTogZHVtbXksIHVidW50dS1zZXJpZXM6IGFzdG9uaXNoaW5nfQo=
     --provider-type=dummy', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
=== added file 'juju/providers/common/tests/data/cloud_init_bootstrap_extra_env'
--- juju/providers/common/tests/data/cloud_init_bootstrap_extra_env	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_bootstrap_extra_env	2012-11-23 21:00:27 +0000
@@ -0,0 +1,69 @@
+#cloud-config
+apt_update: true
+apt_upgrade: true
+machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'localhost:2181',
+  machine-id: passport}
+output: {all: '| tee -a /var/log/cloud-init-output.log'}
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  default-jre-headless, zookeeper, zookeeperd, juju, python-txaws]
+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'juju-admin initialize
+    --instance-id=token --admin-identity=admin:19vlzY4Vc3q4Ew5OsCwKYqrq1HI= --constraints-data=e2NwdTogJzIwJywgcHJvdmlkZXItdHlwZTogZHVtbXksIHVidW50dS1zZXJpZXM6IGFzdG9uaXNoaW5nfQo=
+    --provider-type=dummy', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
+
+    description "Juju machine agent"
+
+    author "Juju Team <[e-mail]>"
+
+
+    start on runlevel [2345]
+
+    stop on runlevel [!2345]
+
+    respawn
+
+
+    env JUJU_MACHINE_ID="passport"
+
+    env JUJU_ZOOKEEPER="localhost:2181"
+
+	env http_proxy="http://myproxy.com:3128/"
+
+	env https_proxy="http://myproxy.com:3128/"
+
+
+    exec python -m juju.agents.machine --nodaemon --logfile /var/log/juju/machine-agent.log
+    --session-file /var/run/juju/machine-agent.zksession >> /tmp/juju-machine-agent.output
+    2>&1
+
+    EOF
+
+    ', /sbin/start juju-machine-agent, 'cat >> /etc/init/juju-provision-agent.conf
+    <<EOF
+
+    description "Juju provisioning agent"
+
+    author "Juju Team <[e-mail]>"
+
+
+    start on runlevel [2345]
+
+    stop on runlevel [!2345]
+
+    respawn
+
+
+    env JUJU_ZOOKEEPER="localhost:2181"
+
+	env http_proxy="http://myproxy.com:3128/"
+
+	env https_proxy="http://myproxy.com:3128/"
+
+
+    exec python -m juju.agents.provision --nodaemon --logfile /var/log/juju/provision-agent.log
+    --session-file /var/run/juju/provision-agent.zksession >> /tmp/juju-provision-agent.output
+    2>&1
+
+    EOF
+
+    ', /sbin/start juju-provision-agent]
+ssh_authorized_keys: [chubb]
 
=== modified file 'juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers'
--- juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers	2012-11-23 21:00:27 +0000
@@ -4,8 +4,8 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181,localhost:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  default-jre-headless, zookeeper, zookeeperd, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  default-jre-headless, zookeeper, zookeeperd, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'juju-admin initialize
     --instance-id=token --admin-identity=admin:19vlzY4Vc3q4Ew5OsCwKYqrq1HI= --constraints-data=e2NwdTogJzIwJywgcHJvdmlkZXItdHlwZTogZHVtbXksIHVidW50dS1zZXJpZXM6IGFzdG9uaXNoaW5nfQo=
     --provider-type=dummy', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
=== modified file 'juju/providers/common/tests/data/cloud_init_branch'
--- juju/providers/common/tests/data/cloud_init_branch	2012-10-09 18:55:55 +0000
+++ juju/providers/common/tests/data/cloud_init_branch	2012-11-23 21:00:27 +0000
@@ -6,7 +6,7 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, python-txaws]
 runcmd: [sudo apt-get install -y python-txzookeeper, sudo mkdir -p /usr/lib/juju,
   'cd /usr/lib/juju && sudo /usr/bin/bzr co --lightweight lp:blah/juju/blah-blah juju', cd /usr/lib/juju/juju
     && sudo python setup.py develop, sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju,
 
=== modified file 'juju/providers/common/tests/data/cloud_init_branch_trunk'
--- juju/providers/common/tests/data/cloud_init_branch_trunk	2012-10-09 18:55:55 +0000
+++ juju/providers/common/tests/data/cloud_init_branch_trunk	2012-11-23 21:00:27 +0000
@@ -6,7 +6,7 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, python-txaws]
 runcmd: [sudo apt-get install -y python-txzookeeper, sudo mkdir -p /usr/lib/juju,
   'cd /usr/lib/juju && sudo /usr/bin/bzr co --lightweight lp:juju juju', cd /usr/lib/juju/juju &&
     sudo python setup.py develop, sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju,
 
=== modified file 'juju/providers/common/tests/data/cloud_init_distro'
--- juju/providers/common/tests/data/cloud_init_distro	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/data/cloud_init_distro	2012-11-23 21:00:27 +0000
@@ -4,8 +4,7 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf
     <<EOF
 
 
=== added file 'juju/providers/common/tests/data/cloud_init_image'
--- juju/providers/common/tests/data/cloud_init_image	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_image	2012-11-23 21:00:27 +0000
@@ -0,0 +1,35 @@
+#cloud-config
+apt_update: true
+apt_upgrade: true
+machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
+  machine-id: passport}
+output: {all: '| tee -a /var/log/cloud-init-output.log'}
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper]
+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf
+    <<EOF
+
+    description "Juju machine agent"
+
+    author "Juju Team <[e-mail]>"
+
+
+    start on runlevel [2345]
+
+    stop on runlevel [!2345]
+
+    respawn
+
+
+    env JUJU_MACHINE_ID="passport"
+
+    env JUJU_ZOOKEEPER="cotswold:2181,longleat:2181"
+
+
+    exec python -m juju.agents.machine --nodaemon --logfile /var/log/juju/machine-agent.log
+    --session-file /var/run/juju/machine-agent.zksession >> /tmp/juju-machine-agent.output
+    2>&1
+
+    EOF
+
+    ', /sbin/start juju-machine-agent]
+ssh_authorized_keys: [chubb]
 
=== added file 'juju/providers/common/tests/data/cloud_init_image_extra_env'
--- juju/providers/common/tests/data/cloud_init_image_extra_env	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_image_extra_env	2012-11-23 21:00:27 +0000
@@ -0,0 +1,39 @@
+#cloud-config
+apt_update: true
+apt_upgrade: true
+machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
+  machine-id: passport}
+output: {all: '| tee -a /var/log/cloud-init-output.log'}
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper]
+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf
+    <<EOF
+
+    description "Juju machine agent"
+
+    author "Juju Team <[e-mail]>"
+
+
+    start on runlevel [2345]
+
+    stop on runlevel [!2345]
+
+    respawn
+
+
+    env JUJU_MACHINE_ID="passport"
+
+    env JUJU_ZOOKEEPER="cotswold:2181,longleat:2181"
+
+	env http_proxy="http://myproxy.com:3128/"
+
+	env https_proxy="http://myproxy.com:3128/"
+
+
+    exec python -m juju.agents.machine --nodaemon --logfile /var/log/juju/machine-agent.log
+    --session-file /var/run/juju/machine-agent.zksession >> /tmp/juju-machine-agent.output
+    2>&1
+
+    EOF
+
+    ', /sbin/start juju-machine-agent]
+ssh_authorized_keys: [chubb]
 
=== modified file 'juju/providers/common/tests/data/cloud_init_no_machine_id'
--- juju/providers/common/tests/data/cloud_init_no_machine_id	2012-09-24 04:04:32 +0000
+++ juju/providers/common/tests/data/cloud_init_no_machine_id	2012-11-23 21:00:27 +0000
@@ -4,7 +4,7 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
                machine-id: }
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws,
-  python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted,
+  python-zookeeper, juju, python-txaws]
 runcmd: ['sudo mkdir -p /var/lib/juju', 'sudo mkdir -p /var/log/juju']
 ssh_authorized_keys: [chubb]
 
=== modified file 'juju/providers/common/tests/data/cloud_init_normal'
--- juju/providers/common/tests/data/cloud_init_normal	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/data/cloud_init_normal	2012-11-23 21:00:27 +0000
@@ -4,8 +4,8 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws,
-  python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted,
+  python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir
     -p /var/log/juju, 'JUJU_MACHINE_ID=passport JUJU_ZOOKEEPER=cotswold:2181,longleat:2181
     python -m juju.agents.machine -n --logfile=/var/log/juju/machine-agent.log
 
=== modified file 'juju/providers/common/tests/data/cloud_init_ppa'
--- juju/providers/common/tests/data/cloud_init_ppa	2012-10-09 18:55:55 +0000
+++ juju/providers/common/tests/data/cloud_init_ppa	2012-11-23 21:00:27 +0000
@@ -6,8 +6,8 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf
     <<EOF
 
 
=== modified file 'juju/providers/common/tests/data/cloud_init_ppa_apt_proxy'
--- juju/providers/common/tests/data/cloud_init_ppa_apt_proxy	2012-10-09 18:55:55 +0000
+++ juju/providers/common/tests/data/cloud_init_ppa_apt_proxy	2012-11-23 21:00:27 +0000
@@ -7,8 +7,8 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf
     <<EOF
 
 
=== modified file 'juju/providers/common/tests/data/cloud_init_proposed'
--- juju/providers/common/tests/data/cloud_init_proposed	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/data/cloud_init_proposed	2012-11-23 21:00:27 +0000
@@ -6,7 +6,7 @@
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
     /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
 
=== modified file 'juju/providers/common/tests/test_cloudinit.py'
--- juju/providers/common/tests/test_cloudinit.py	2012-10-09 18:55:55 +0000
+++ juju/providers/common/tests/test_cloudinit.py	2012-11-23 21:00:27 +0000
@@ -107,6 +107,18 @@
                        "/usr/lib/pymodules/python2.7/juju/__init__.pyc")
         self.assert_render(self.construct_normal(), "cloud_init_distro")
 
+    def test_render_image_source(self):
+        cloud_init = self.construct_normal()
+        cloud_init.set_juju_source(image=True)
+        self.assert_render(cloud_init, "cloud_init_image")
+
+    def test_render_extra_environment(self):
+        cloud_init = self.construct_normal()
+        cloud_init.set_juju_source(image=True)
+        cloud_init.set_env("http_proxy", "http://myproxy.com:3128/")
+        cloud_init.set_env("https_proxy", "http://myproxy.com:3128/")
+        self.assert_render(cloud_init, "cloud_init_image_extra_env")
+
     def test_render_ppa_source(self):
         cloud_init = self.construct_normal()
         cloud_init.set_juju_source(ppa=True)
@@ -135,6 +147,12 @@
     def test_render_bootstrap(self):
         self.assert_render(self.construct_bootstrap(), "cloud_init_bootstrap")
 
+    def test_render_bootstrap_with_extra_environment(self):
+        cloud_init = self.construct_bootstrap()
+        cloud_init.set_env("http_proxy", "http://myproxy.com:3128/")
+        cloud_init.set_env("https_proxy", "http://myproxy.com:3128/")
+        self.assert_render(cloud_init, "cloud_init_bootstrap_extra_env")
+
     def test_render_bootstrap_with_zookeepers(self):
         self.assert_render(
             self.construct_bootstrap(True), "cloud_init_bootstrap_zookeepers")
@@ -168,6 +186,13 @@
         cloud_init.set_zookeeper_hosts(['bar1.private', 'bar2.private'])
         self.assertEqual(['bar1.private', 'bar2.private'], cloud_init._zookeeper_hosts)
 
+    def test_set_zookeeper_machines_in_private_mode(self):
+        machine = ProviderMachine('i-100', 'foo1', 'foo1.private', private_ip_address='10.0.1.0')
+        cloud_init = CloudInit()
+        cloud_init.private = True
+        cloud_init.set_zookeeper_machines([machine])
+        self.assertEqual(['10.0.1.0'], cloud_init._zookeeper_hosts)
+
     def test_set_zookeeper_hosts_tuple(self):
         cloud_init = CloudInit()
         cloud_init.set_zookeeper_hosts([('bar1.private', 9999)])
@@ -330,3 +355,14 @@
         self.patch(juju, "__file__",
                        "/usr/lib/pymodules/python2.7/juju/__init__.pyc")
         self.assertEquals(get_default_origin(), ("distro", None))
+
+    def test_set_env(self):
+        cloudinit = CloudInit()
+        cloudinit.set_env("http_proxy", "http://myproxy.com:3128/")
+        self.assertEquals(cloudinit._extra_environment["http_proxy"], "http://myproxy.com:3128/")
+
+    def test_unset_env(self):
+        cloudinit = CloudInit()
+        cloudinit.set_env("http_proxy", "http://myproxy.com:3128/")
+        cloudinit.unset_env("http_proxy")
+        self.assertNotIn("http_proxy", cloudinit._extra_environment)
 
=== modified file 'juju/providers/ec2/__init__.py'
--- juju/providers/ec2/__init__.py	2012-08-28 16:11:41 +0000
+++ juju/providers/ec2/__init__.py	2012-11-23 21:00:27 +0000
@@ -149,12 +149,13 @@
                 % (", ".join(instance_ids), message))
 
         machines = []
+        private = self.config.get("vpc_id") is not None
         for instance in instances:
             if instance.instance_state not in ("running", "pending"):
                 continue
-            if group_name not in instance.reservation.groups:
+            if group_name not in [g[1] for g in instance.reservation.groups]:
                 continue
-            machines.append(machine_from_instance(instance))
+            machines.append(machine_from_instance(instance, private))
 
         if instance_ids:
             # We were asked for a specific list of machines, and if we can't
 
=== modified file 'juju/providers/ec2/launch.py'
--- juju/providers/ec2/launch.py	2012-07-05 21:49:12 +0000
+++ juju/providers/ec2/launch.py	2012-11-23 21:00:27 +0000
@@ -38,15 +38,20 @@
         spec = yield get_machine_spec(self._provider.config, self._constraints)
         security_groups = yield self._ensure_groups(machine_id)
 
+        subnet = self._provider.config.get("subnet_id")
+        kw = {
+            'min_count': 1,
+            'max_count': 1,
+            'image_id': spec.image_id,
+            'instance_type': spec.instance_type,
+            'availability_zone': availability_zone,
+            'user_data': user_data,
+        }
+        if subnet:
+            kw['subnet_id'] = subnet
+        kw['security_group_ids'] = security_groups
         log.debug("Launching with machine spec %s", spec)
-        instances = yield self._provider.ec2.run_instances(
-            min_count=1,
-            max_count=1,
-            image_id=spec.image_id,
-            instance_type=spec.instance_type,
-            security_groups=security_groups,
-            availability_zone=availability_zone,
-            user_data=user_data)
+        instances = yield self._provider.ec2.run_instances(**kw)
 
         returnValue([machine_from_instance(i) for i in instances])
 
@@ -68,18 +73,24 @@
             self._provider.environment_name, machine_id)
 
         security_groups = yield self._provider.ec2.describe_security_groups()
-        group_ids = [group.name for group in security_groups]
+        group_names = [group.name for group in security_groups]
+        vpc_id = self._provider.config.get("vpc_id")
 
         # Create the provider group if doesn't exist.
-        if not juju_group in group_ids:
+        if juju_group in group_names:
+            for group in security_groups:
+                if group.name == juju_group:
+                    juju_group_id = group.id
+        else:
             log.debug("Creating juju provider group %s", juju_group)
-            yield self._provider.ec2.create_security_group(
+            juju_group_id = yield self._provider.ec2.create_security_group(
                 juju_group,
-                "juju group for %s" % self._provider.environment_name)
+                "juju group for %s" % self._provider.environment_name,
+                vpc_id=vpc_id)
 
             # Authorize SSH.
             yield self._provider.ec2.authorize_security_group(
-                juju_group,
+                group_id=juju_group_id,
                 ip_protocol="tcp",
                 from_port="22", to_port="22",
                 cidr_ip="0.0.0.0/0")
@@ -90,15 +101,20 @@
 
             # Authorize Internal ZK Traffic
             yield self._provider.ec2.authorize_security_group(
-                juju_group,
+                group_id=juju_group_id,
                 source_group_name=juju_group,
                 source_group_owner_id=groups_info.pop().owner_id)
 
         # Create the machine-specific group if it does not already exist
-        if not juju_machine_group in group_ids:
-            yield self._provider.ec2.create_security_group(
+        if juju_machine_group in group_names:
+            for group in security_groups:
+                if group.name == juju_machine_group:
+                    juju_machine_group_id = group.id
+        else:
+            juju_machine_group_id = yield self._provider.ec2.create_security_group(
                 juju_machine_group,
                 "juju group for %s machine %s" % (
-                    self._provider.environment_name, machine_id))
+                    self._provider.environment_name, machine_id),
+                vpc_id=vpc_id)
 
-        returnValue([juju_group, juju_machine_group])
+        returnValue([juju_group_id, juju_machine_group_id])
 
=== modified file 'juju/providers/ec2/machine.py'
--- juju/providers/ec2/machine.py	2011-10-11 10:59:04 +0000
+++ juju/providers/ec2/machine.py	2012-11-23 21:00:27 +0000
@@ -8,15 +8,19 @@
     """
 
 
-def machine_from_instance(instance):
+def machine_from_instance(instance, private=False):
     """Create an :class:`EC2ProviderMachine` from a txaws :class:`Instance`
 
     :param instance: the EC2 Instance
 
     :return: a matching :class:`EC2ProviderMachine`
     """
-    return EC2ProviderMachine(
+    params = [
         instance.instance_id,
         instance.dns_name,
         instance.private_dns_name,
-        instance.instance_state)
+        instance.instance_state,
+        instance.private_ip_address]
+    if private:
+        params[1] = params[2] = instance.private_ip_address
+    return EC2ProviderMachine(*params)
 
=== modified file 'juju/providers/ec2/securitygroup.py'
--- juju/providers/ec2/securitygroup.py	2012-07-05 21:49:12 +0000
+++ juju/providers/ec2/securitygroup.py	2012-11-23 21:00:27 +0000
@@ -6,14 +6,32 @@
 from .utils import log
 
 
+@inlineCallbacks
+def _get_security_group_id(group_name, ec2):
+    groups = yield ec2.describe_security_groups()
+    for group in groups:
+        if group.name == group_name:
+            returnValue(group.id)
+
+
 def _get_juju_security_group(provider):
     """Get EC2 security group name for environment of `provider`."""
     return "juju-%s" % provider.environment_name
 
 
+def _get_juju_security_group_id(provider):
+    name = "juju-%s" % provider.environment_name
+    return _get_security_group_id(name, provider.ec2)
+
+
 def _get_machine_group_name(provider, machine_id):
+    return "juju-%s-%s" % (provider.environment_name, machine_id)
+
+
+def _get_machine_group_id(provider, machine_id):
     """Get EC2 security group name associated just with `machine_id`."""
-    return "juju-%s-%s" % (provider.environment_name, machine_id)
+    name = _get_machine_group_name(provider, machine_id)
+    return _get_security_group_id(name, provider.ec2)
 
 
 # TODO These security group functions do not handle the eventual
@@ -34,8 +52,9 @@
 def open_provider_port(provider, machine, machine_id, port, protocol):
     """Authorize `port`/`proto` for the machine security group."""
     try:
+        group_id = yield _get_machine_group_id(provider, machine_id)
         yield provider.ec2.authorize_security_group(
-            _get_machine_group_name(provider, machine_id),
+            group_id=group_id,
             ip_protocol=protocol,
             from_port=str(port), to_port=str(port),
             cidr_ip="0.0.0.0/0")
@@ -51,8 +70,9 @@
 def close_provider_port(provider, machine, machine_id, port, protocol):
     """Revoke `port`/`proto` for the machine security group."""
     try:
+        group_id = yield _get_machine_group_id(provider, machine_id)
         yield provider.ec2.revoke_security_group(
-            _get_machine_group_name(provider, machine_id),
+            group_id=group_id,
             ip_protocol=protocol,
             from_port=str(port), to_port=str(port),
             cidr_ip="0.0.0.0/0")
@@ -73,15 +93,20 @@
     proto) pairs.
     """
     try:
-        security_groups = yield provider.ec2.describe_security_groups(
-            _get_machine_group_name(provider, machine_id))
+        security_group = None
+        security_groups = yield provider.ec2.describe_security_groups()
+        name = _get_machine_group_name(provider, machine_id)
+        for group in security_groups:
+            if group.name == name:
+                security_group = group
+                break
     except EC2Error, e:
         raise ProviderInteractionError(
             "Unexpected EC2Error getting open ports on machine %s: %s"
             % (machine.instance_id, e.get_error_messages()))
 
     opened_ports = set()  # made up of (port, protocol) pairs
-    for ip_permission in security_groups[0].allowed_ips:
+    for ip_permission in security_group.allowed_ips:
         if ip_permission.cidr_ip != "0.0.0.0/0":
             continue
         from_port = int(ip_permission.from_port)
@@ -110,24 +135,15 @@
 
 
 @inlineCallbacks
-def _delete_security_group(provider, group):
-    """Wrap EC2 delete_security_group."""
-    try:
-        yield provider.ec2.delete_security_group(group)
-        log.debug("Deleted security group %r", group)
-    except EC2Error, e:
-        raise ProviderInteractionError(
-            "EC2 error when attempting to delete group %s: %s" % (group, e))
-
-
-@inlineCallbacks
 def destroy_environment_security_group(provider):
     """Delete the security group for the environment of `provider`"""
     group = _get_juju_security_group(provider)
     try:
-        yield provider.ec2.delete_security_group(group)
-        log.debug("Deleted environment security group %r", group)
-        returnValue(True)
+        group_id = yield _get_juju_security_group_id(provider)
+        if group_id:
+            yield provider.ec2.delete_security_group(id=group_id)
+            log.debug("Deleted environment security group %r", group)
+            returnValue(True)
     except EC2Error, e:
         # Ignore, since this is only attempting to cleanup
         log.debug(
 
=== modified file 'juju/providers/ec2/tests/common.py'
--- juju/providers/ec2/tests/common.py	2012-09-10 03:20:20 +0000
+++ juju/providers/ec2/tests/common.py	2012-11-23 21:00:27 +0000
@@ -49,8 +49,8 @@
     def get_instance(self,
                      instance_id, state="running", machine_id=42, **kwargs):
         groups = kwargs.pop("groups",
-                            ["juju-%s" % self.env_name,
-                             "juju-%s-%s" % (self.env_name, machine_id)])
+                            [("sg-a1a1a1", "juju-%s" % self.env_name),
+                             ("sg-b2b2b2", "juju-%s-%s" % (self.env_name, machine_id))])
         reservation = Reservation("x", "y", groups=groups)
         return Instance(instance_id, state, reservation=reservation, **kwargs)
 
@@ -108,32 +108,33 @@
         get_ami(*get_ami_args)
         self.mocker.result(succeed(ami_name))
 
-    def _mock_create_group(self):
+    def _mock_create_group(self, vpc_id=None):
         group_name = "juju-%s" % self.env_name
         self.ec2.create_security_group(
-            group_name, "juju group for %s" % self.env_name)
-        self.mocker.result(succeed(True))
+            group_name, "juju group for %s" % self.env_name,
+            vpc_id=vpc_id)
+        self.mocker.result(succeed("sg-a1a1a1a1"))
 
         self.ec2.authorize_security_group(
-            group_name, ip_protocol="tcp", from_port="22",
+            group_id="sg-a1a1a1a1", ip_protocol="tcp", from_port="22",
             to_port="22", cidr_ip="0.0.0.0/0")
         self.mocker.result(succeed([self.env_name]))
 
         self.ec2.describe_security_groups(group_name)
         self.mocker.result(succeed(
-            [SecurityGroup(group_name, "", owner_id="123")]))
+            [SecurityGroup("sg-a1a1a1a1", group_name, "", owner_id="123")]))
 
         self.ec2.authorize_security_group(
-            group_name, source_group_name=group_name,
+            group_id="sg-a1a1a1a1", source_group_name=group_name,
             source_group_owner_id="123")
         self.mocker.result(succeed(True))
 
-    def _mock_create_machine_group(self, machine_id):
+    def _mock_create_machine_group(self, machine_id, vpc_id=None):
         machine_group_name = "juju-%s-%s" % (self.env_name, machine_id)
         self.ec2.create_security_group(
             machine_group_name, "juju group for %s machine %s" % (
-                self.env_name, machine_id))
-        self.mocker.result(succeed(True))
+                self.env_name, machine_id), vpc_id=vpc_id)
+        self.mocker.result(succeed("sg-b2b2b2b2"))
 
     def _mock_get_zookeeper_hosts(self, hosts=None):
         """
@@ -147,7 +148,7 @@
 
         if hosts is None:
             hosts = [self.get_instance(
-                "i-es-zoo", private_dns_name="es.example.internal")]
+                "i-es-zoo", private_dns_name="es.example.internal", private_ip_address="1.1.1.1")]
 
         self.s3.get_object(self.env_name, "provider-state")
         if hosts is False:
 
=== modified file 'juju/providers/ec2/tests/data/bootstrap_cloud_init'
--- juju/providers/ec2/tests/data/bootstrap_cloud_init	2012-08-23 16:14:42 +0000
+++ juju/providers/ec2/tests/data/bootstrap_cloud_init	2012-11-23 21:00:27 +0000
@@ -3,8 +3,8 @@
 apt_upgrade: true
 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'localhost:2181', machine-id: '0'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  default-jre-headless, zookeeper, zookeeperd, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  default-jre-headless, zookeeper, zookeeperd, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'juju-admin initialize
     --instance-id=$(curl http://169.254.169.254/1.0/meta-data/instance-id) --admin-identity=admin:JbJ6sDGV37EHzbG9FPvttk64cmg=
     --constraints-data=e2NwdTogbnVsbCwgaW5zdGFuY2UtdHlwZTogbTEuc21hbGwsIG1lbTogbnVsbCwgcHJvdmlkZXItdHlwZTogZWMyLCB1YnVudHUtc2VyaWVzOiBzcGxlbmRpZH0K
 
=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init'
--- juju/providers/ec2/tests/data/launch_cloud_init	2012-08-23 16:14:42 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init	2012-11-23 21:00:27 +0000
@@ -4,7 +4,7 @@
 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'es.example.internal:2181',
   machine-id: '1'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
     /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
 
=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init_branch'
--- juju/providers/ec2/tests/data/launch_cloud_init_branch	2012-10-09 18:55:55 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init_branch	2012-11-23 21:00:27 +0000
@@ -6,7 +6,7 @@
 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'es.example.internal:2181',
   machine-id: '1'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, python-txaws]
 runcmd: [sudo apt-get install -y python-txzookeeper, sudo mkdir -p /usr/lib/juju,
   'cd /usr/lib/juju && sudo /usr/bin/bzr co --lightweight lp:~wizard/juju-juicebar juju', cd /usr/lib/juju/juju
     && sudo python setup.py develop, sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju,
 
=== added file 'juju/providers/ec2/tests/data/launch_cloud_init_ip_address'
--- juju/providers/ec2/tests/data/launch_cloud_init_ip_address	1970-01-01 00:00:00 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init_ip_address	2012-11-23 21:00:27 +0000
@@ -0,0 +1,35 @@
+#cloud-config
+apt_update: true
+apt_upgrade: true
+machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: '1.1.1.1:2181',
+  machine-id: '1'}
+output: {all: '| tee -a /var/log/cloud-init-output.log'}
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
+    /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
+
+    description "Juju machine agent"
+
+    author "Juju Team <[e-mail]>"
+
+
+    start on runlevel [2345]
+
+    stop on runlevel [!2345]
+
+    respawn
+
+
+    env JUJU_MACHINE_ID="1"
+
+    env JUJU_ZOOKEEPER="1.1.1.1:2181"
+
+
+    exec python -m juju.agents.machine --nodaemon --logfile /var/log/juju/machine-agent.log
+    --session-file /var/run/juju/machine-agent.zksession >> /tmp/juju-machine-agent.output
+    2>&1
+
+    EOF
+
+    ', /sbin/start juju-machine-agent]
+ssh_authorized_keys: [zebra]
 
=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init_ppa'
--- juju/providers/ec2/tests/data/launch_cloud_init_ppa	2012-10-09 18:55:55 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init_ppa	2012-11-23 21:00:27 +0000
@@ -6,7 +6,7 @@
 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'es.example.internal:2181',
   machine-id: '1'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
     /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
 
=== modified file 'juju/providers/ec2/tests/test_bootstrap.py'
--- juju/providers/ec2/tests/test_bootstrap.py	2012-09-10 03:20:20 +0000
+++ juju/providers/ec2/tests/test_bootstrap.py	2012-11-23 21:00:27 +0000
@@ -48,7 +48,7 @@
             instance_type="m1.small",
             max_count=1,
             min_count=1,
-            security_groups=["juju-moon", "juju-moon-0"],
+            security_group_ids=["sg-a1a1a1a1", "sg-b2b2b2b2"],
             availability_zone=None,
             user_data=MATCH(verify_user_data))
 
@@ -90,7 +90,7 @@
         self._mock_verify()
         self.ec2.describe_security_groups()
         self.mocker.result(succeed([
-            SecurityGroup("juju-%s" % self.env_name, "")]))
+            SecurityGroup("sg-a1a1a1a1", "juju-%s" % self.env_name, "")]))
         self._mock_create_machine_group(0)
         self._mock_launch_utils()
         self._mock_launch()
@@ -138,7 +138,7 @@
         self._mock_verify()
         self.ec2.describe_security_groups()
         self.mocker.result(succeed([
-            SecurityGroup("juju-%s" % self.env_name, "")]))
+            SecurityGroup("sg-a1a1a1a1", "juju-%s" % self.env_name, "")]))
         self._mock_create_machine_group(0)
         self._mock_launch_utils()
         self._mock_launch()
 
=== modified file 'juju/providers/ec2/tests/test_launch.py'
--- juju/providers/ec2/tests/test_launch.py	2012-09-10 03:20:20 +0000
+++ juju/providers/ec2/tests/test_launch.py	2012-11-23 21:00:27 +0000
@@ -31,7 +31,7 @@
     def _mock_launch(self, instance, expect_ami="ami-default",
                      expect_instance_type="m1.small",
                      expect_availability_zone=None,
-                     cloud_init="launch_cloud_init"):
+                     cloud_init="launch_cloud_init", **extra):
 
         def verify_user_data(data):
             expect_path = os.path.join(DATA_DIR, cloud_init)
@@ -45,12 +45,26 @@
             instance_type=expect_instance_type,
             max_count=1,
             min_count=1,
-            security_groups=["juju-moon", "juju-moon-1"],
             availability_zone=expect_availability_zone,
-            user_data=MATCH(verify_user_data))
+            user_data=MATCH(verify_user_data), **extra)
 
         self.mocker.result(succeed([instance]))
 
+    def _mock_launch_groupname(self, instance, expect_ami="ami-default",
+                     expect_instance_type="m1.small",
+                     expect_availability_zone=None,
+                     cloud_init="launch_cloud_init", **extra):
+        extra["security_group_ids"] = ["sg-a1a1a1a1", "sg-b2b2b2b2"]
+        self._mock_launch(instance, expect_ami, expect_instance_type, expect_availability_zone, cloud_init, **extra)
+
+    def _mock_launch_subnet(self, instance, subnet_id, expect_ami="ami-default",
+                     expect_instance_type="m1.small",
+                     expect_availability_zone=None,
+                     cloud_init="launch_cloud_init", **extra):
+        extra["subnet_id"] = subnet_id
+        extra["security_group_ids"] = ["sg-a1a1a1a1", "sg-b2b2b2b2"]
+        self._mock_launch(instance, expect_ami, expect_instance_type, expect_availability_zone, cloud_init, **extra)
+
     def test_bad_data(self):
         self.mocker.replay()
         d = self.get_provider().start_machine({})
@@ -74,13 +88,39 @@
         self._mock_create_machine_group("1")
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(self.get_instance("i-foobar"))
-        self.mocker.replay()
-
-        def verify_result(result):
-            (machine,) = result
-            self.assert_machine(machine, "i-foobar", "")
-        provider = self.get_provider()
+        self._mock_launch_groupname(self.get_instance("i-foobar"))
+        self.mocker.replay()
+
+        def verify_result(result):
+            (machine,) = result
+            self.assert_machine(machine, "i-foobar", "")
+        provider = self.get_provider()
+        d = provider.start_machine({
+            "machine-id": "1", "constraints": self.constraints})
+        d.addCallback(verify_result)
+        return d
+
+    def test_provider_launch_with_subnet_and_vpc(self):
+        vpc_id = "vpc-a1d4f2"
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([]))
+        self._mock_create_group(vpc_id=vpc_id)
+        self._mock_create_machine_group("1", vpc_id=vpc_id)
+        self._mock_launch_utils()
+        self._mock_get_zookeeper_hosts()
+        self._mock_launch_subnet(
+            self.get_instance("i-foobar", private_ip_address="1.1.1.1"),
+            "subnet-a7f22c3e",
+            cloud_init="launch_cloud_init_ip_address"
+        )
+        self.mocker.replay()
+
+        def verify_result(result):
+            (machine,) = result
+            self.assert_machine(machine, "i-foobar", "")
+        provider = self.get_provider()
+        provider.config["subnet_id"] = "subnet-a7f22c3e"
+        provider.config["vpc_id"] = vpc_id
         d = provider.start_machine({
             "machine-id": "1", "constraints": self.constraints})
         d.addCallback(verify_result)
@@ -104,7 +144,7 @@
         self._mock_create_machine_group("1")
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(
+        self._mock_launch_groupname(
             self.get_instance("i-foobar"),
             cloud_init="launch_cloud_init_branch")
         self.mocker.replay()
@@ -124,7 +164,7 @@
         self._mock_create_machine_group("1")
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(
+        self._mock_launch_groupname(
             self.get_instance("i-foobar"),
             cloud_init="launch_cloud_init_ppa")
         self.mocker.replay()
@@ -144,7 +184,7 @@
         self._mock_create_machine_group("1")
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(
+        self._mock_launch_groupname(
             self.get_instance("i-foobar"),
             cloud_init="launch_cloud_init")
         self.mocker.replay()
@@ -159,14 +199,15 @@
     def test_provider_launch_existing_security_group(self):
         """Verify that the launch works if the env security group exists"""
         instance = Instance("i-foobar", "running", dns_name="x1.example.com")
-        security_group = SecurityGroup("juju-moon", "some description")
+        security_group = SecurityGroup("sg-a1a1a1a1", "juju-moon", "some description")
 
         self.ec2.describe_security_groups()
         self.mocker.result(succeed([security_group]))
+        self.mocker.count(1)
         self._mock_create_machine_group("1")
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(instance)
+        self._mock_launch_groupname(instance)
         self.mocker.replay()
 
         provider = self.get_provider()
@@ -180,15 +221,13 @@
     def test_provider_launch_existing_machine_security_group(self):
         """Verify that the launch works if the machine security group exists"""
         instance = Instance("i-foobar", "running", dns_name="x1.example.com")
-        machine_group = SecurityGroup(
-            "juju-moon-1", "some description")
-
+        machine_group = SecurityGroup("sg-b2b2b2b2", "juju-moon-1", "some description")
         self.ec2.describe_security_groups()
         self.mocker.result(succeed([machine_group]))
         self._mock_create_group()
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(instance)
+        self._mock_launch_groupname(instance)
         self.mocker.replay()
 
         provider = self.get_provider()
@@ -206,15 +245,13 @@
         that security group, generally because it is still shutting
         down."""
         instance = Instance("i-foobar", "running", dns_name="x1.example.com")
-        machine_group = SecurityGroup(
-            "juju-moon-1", "some description")
-
+        machine_group = SecurityGroup("sg-b2b2b2b2", "juju-moon-1", "some description")
         self.ec2.describe_security_groups()
         self.mocker.result(succeed([machine_group]))
         self._mock_create_group()
         self._mock_launch_utils()
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(instance)
+        self._mock_launch_groupname(instance)
         self.mocker.replay()
 
         provider = self.get_provider()
@@ -266,7 +303,7 @@
             get_ami_args=(
                 "splendid", "amd64", "somewhere-else-1", False, False))
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(self.get_instance("i-foobar"), "ami-regional")
+        self._mock_launch_groupname(self.get_instance("i-foobar"), "ami-regional")
         self.mocker.replay()
 
         provider = self.get_provider()
@@ -283,7 +320,7 @@
             ami_name="ami-fancy-cluster",
             get_ami_args=("vast", "amd64", "us-east-1", True, False))
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(
+        self._mock_launch_groupname(
             self.get_instance("i-foobar"), "ami-fancy-cluster",
             expect_instance_type="cc2.8xlarge",
             expect_availability_zone="us-east-1b")
@@ -302,7 +339,7 @@
         self._mock_launch_utils(
             get_ami_args=("dribbly", "amd64", "us-east-1", False, False))
         self._mock_get_zookeeper_hosts()
-        self._mock_launch(
+        self._mock_launch_groupname(
             self.get_instance("i-foobar"), "ami-default",
             expect_instance_type="c1.xlarge")
         self.mocker.replay()
 
=== modified file 'juju/providers/ec2/tests/test_machine.py'
--- juju/providers/ec2/tests/test_machine.py	2011-10-11 14:03:11 +0000
+++ juju/providers/ec2/tests/test_machine.py	2012-11-23 21:00:27 +0000
@@ -11,7 +11,8 @@
         instance = Instance(
             "i-foobar", "oscillating",
             dns_name="public",
-            private_dns_name="private")
+            private_dns_name="private",
+            private_ip_address="10.0.1.10")
 
         machine = machine_from_instance(instance)
         self.assertTrue(isinstance(machine, EC2ProviderMachine))
@@ -19,3 +20,19 @@
         self.assertEquals(machine.dns_name, "public")
         self.assertEquals(machine.private_dns_name, "private")
         self.assertEquals(machine.state, "oscillating")
+        self.assertEquals(machine.private_ip_address, "10.0.1.10")
+
+    def test_machine_from_instance_private_mode(self):
+        instance = Instance(
+            "i-foobar", "oscillating",
+            dns_name="public",
+            private_dns_name="private",
+            private_ip_address="10.0.1.10")
+
+        machine = machine_from_instance(instance, True)
+        self.assertTrue(isinstance(machine, EC2ProviderMachine))
+        self.assertEquals(machine.instance_id, "i-foobar")
+        self.assertEquals(machine.dns_name, "10.0.1.10")
+        self.assertEquals(machine.private_dns_name, "10.0.1.10")
+        self.assertEquals(machine.state, "oscillating")
+        self.assertEquals(machine.private_ip_address, "10.0.1.10")
 
=== modified file 'juju/providers/ec2/tests/test_securitygroup.py'
--- juju/providers/ec2/tests/test_securitygroup.py	2012-07-05 21:49:12 +0000
+++ juju/providers/ec2/tests/test_securitygroup.py	2012-11-23 21:00:27 +0000
@@ -18,9 +18,12 @@
     def test_open_provider_port(self):
         """Verify open port op will use the correct EC2 API."""
         log = self.capture_logging("juju.ec2", level=logging.DEBUG)
+        secgroup = SecurityGroup("sg-a1a1a1", "juju-moon-machine-1", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
         machine = ProviderMachine("i-foobar", "x1.example.com")
         self.ec2.authorize_security_group(
-            "juju-moon-machine-1", ip_protocol="tcp", from_port="80",
+            group_id=secgroup.id, ip_protocol="tcp", from_port="80",
             to_port="80", cidr_ip="0.0.0.0/0")
         self.mocker.result(succeed(True))
         self.mocker.replay()
@@ -35,9 +38,12 @@
     def test_close_provider_port(self):
         """Verify close port op will use the correct EC2 API."""
         log = self.capture_logging("juju.ec2", level=logging.DEBUG)
+        secgroup = SecurityGroup("sg-b2b2b2", "juju-moon-machine-1", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
         machine = ProviderMachine("i-foobar", "x1.example.com")
         self.ec2.revoke_security_group(
-            "juju-moon-machine-1", ip_protocol="tcp", from_port="80",
+            group_id="sg-b2b2b2", ip_protocol="tcp", from_port="80",
             to_port="80", cidr_ip="0.0.0.0/0")
         self.mocker.result(succeed(True))
         self.mocker.replay()
@@ -51,9 +57,10 @@
     @inlineCallbacks
     def test_get_provider_opened_ports(self):
         """Verify correct parse of IP perms from describe_security_group."""
-        self.ec2.describe_security_groups("juju-moon-machine-1")
+        self.ec2.describe_security_groups()
         self.mocker.result(succeed([
                     SecurityGroup(
+                        "sg-a1b2c3d4e5f6",
                         "juju-%s-machine-1" % self.env_name,
                         "a security group name",
                         ips=[
@@ -76,9 +83,12 @@
     @inlineCallbacks
     def test_open_provider_port_unknown_instance(self):
         """Verify open port op will use the correct EC2 API."""
+        secgroup = SecurityGroup("sg-a1a1a1", "juju-moon-machine-1", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
         machine = ProviderMachine("i-foobar", "x1.example.com")
         self.ec2.authorize_security_group(
-            "juju-moon-machine-1", ip_protocol="tcp", from_port="80",
+            group_id="sg-a1a1a1", ip_protocol="tcp", from_port="80",
             to_port="80", cidr_ip="0.0.0.0/0")
         self.mocker.result(fail(self.get_ec2_error("i-foobar")))
         self.mocker.replay()
@@ -95,9 +105,12 @@
     @inlineCallbacks
     def test_close_provider_port_unknown_instance(self):
         """Verify open port op will use the correct EC2 API."""
+        secgroup = SecurityGroup("sg-b2b2b2", "juju-moon-machine-1", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
         machine = ProviderMachine("i-foobar", "x1.example.com")
         self.ec2.revoke_security_group(
-            "juju-moon-machine-1", ip_protocol="tcp", from_port="80",
+            group_id="sg-b2b2b2", ip_protocol="tcp", from_port="80",
             to_port="80", cidr_ip="0.0.0.0/0")
         self.mocker.result(fail(self.get_ec2_error("i-foobar")))
         self.mocker.replay()
@@ -114,7 +127,7 @@
     @inlineCallbacks
     def test_get_provider_opened_ports_unknown_instance(self):
         """Verify open port op will use the correct EC2 API."""
-        self.ec2.describe_security_groups("juju-moon-machine-1")
+        self.ec2.describe_security_groups()
         self.mocker.result(fail(self.get_ec2_error("i-foobar")))
         self.mocker.replay()
 
@@ -134,7 +147,10 @@
     @inlineCallbacks
     def test_destroy_environment_security_group(self):
         """Verify the deletion of the security group for the environment"""
-        self.ec2.delete_security_group("juju-moon")
+        secgroup = SecurityGroup("sg-0e0e0e", "juju-moon", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
+        self.ec2.delete_security_group(id="sg-0e0e0e")
         self.mocker.result(succeed(True))
         self.mocker.replay()
 
@@ -143,10 +159,12 @@
         self.assertTrue(destroyed)
 
     @inlineCallbacks
-    def test_destroy_environment_security_group_missing(self):
-        """Verify ignores errors in deleting the env security group"""
+    def test_destroy_environment_security_group_ignores_failure(self):
         log = self.capture_logging(level=logging.DEBUG)
-        self.ec2.delete_security_group("juju-moon")
+        secgroup = SecurityGroup("sg-0e0e0e", "juju-moon", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
+        self.ec2.delete_security_group(id="sg-0e0e0e")
         self.mocker.result(fail(
                 self.get_ec2_error(
                     "juju-moon",
@@ -162,3 +180,14 @@
             "juju-moon: Error Message: The security group "
             "'juju-moon' does not exist",
             log.getvalue())
+
+    @inlineCallbacks
+    def test_destroy_environment_security_group_missing(self):
+        """Verify ignores errors in deleting the env security group"""
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([]))
+        self.mocker.replay()
+
+        provider = self.get_provider()
+        destroyed = yield destroy_environment_security_group(provider)
+        self.assertFalse(destroyed)
 
=== modified file 'juju/providers/ec2/tests/test_shutdown.py'
--- juju/providers/ec2/tests/test_shutdown.py	2012-07-09 22:59:18 +0000
+++ juju/providers/ec2/tests/test_shutdown.py	2012-11-23 21:00:27 +0000
@@ -2,12 +2,13 @@
 
 from juju.lib.testing import TestCase
 from juju.providers.ec2.tests.common import (
-    EC2TestMixin, MATCH_GROUP, Observed, MockInstanceState)
+    EC2TestMixin, MATCH_GROUP, MockInstanceState)
 
 from juju.machine import ProviderMachine
 
 from juju.errors import MachinesNotFound, ProviderError
 from juju.providers.ec2.machine import EC2ProviderMachine
+from txaws.ec2.model import SecurityGroup
 
 
 class SomeError(Exception):
@@ -156,10 +157,11 @@
                     ("i-canbekilled", "running", "shutting-down"),
                     ("i-canbekilledtoo", "pending", "shutting-down")]))
 
-        self.ec2.delete_security_group(MATCH_GROUP)
-        deleted_groups = Observed()
-        self.mocker.call(deleted_groups.add)
-        self.mocker.count(1)
+        secgroup = SecurityGroup("sg-0a0a0a", "juju-moon", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
+        self.ec2.delete_security_group(id="sg-0a0a0a")
+        self.mocker.result(succeed(True))
 
         self.mocker.replay()
 
@@ -169,9 +171,6 @@
         self.assertEquals(machine_1.instance_id, "i-canbekilled")
         self.assertTrue(isinstance(machine_2, EC2ProviderMachine))
         self.assertEquals(machine_2.instance_id, "i-canbekilledtoo")
-        self.assertEquals(
-            deleted_groups.items,
-            set(["juju-moon"]))
 
     @inlineCallbacks
     def test_s3_failure(self):
@@ -189,7 +188,10 @@
         self.ec2.terminate_instances("i-canbekilled")
         self.mocker.result(succeed([
             ("i-canbekilled", "running", "shutting-down")]))
-        self.ec2.delete_security_group("juju-moon")
+        secgroup = SecurityGroup("sg-0a0a0a", "juju-moon", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
+        self.ec2.delete_security_group(id="sg-0a0a0a")
         self.mocker.result(succeed(True))
         self.mocker.replay()
 
@@ -208,7 +210,10 @@
         self.mocker.result(succeed(None))
         self.ec2.describe_instances()
         self.mocker.result(succeed([]))
-        self.ec2.delete_security_group("juju-moon")
+        secgroup = SecurityGroup("sg-0a0a0a", "juju-moon", "some description")
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([secgroup]))
+        self.ec2.delete_security_group(id="sg-0a0a0a")
         self.mocker.result(fail(
                 self.get_ec2_error(
                     "juju-moon",
 
=== modified file 'juju/providers/ec2/utils.py'
--- juju/providers/ec2/utils.py	2012-07-05 21:49:12 +0000
+++ juju/providers/ec2/utils.py	2012-11-23 21:00:27 +0000
@@ -6,10 +6,10 @@
 import StringIO
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.web.client import getPage
 from twisted.web.error import Error
 
 from juju.errors import ProviderError
+from juju.lib.http_client import get_page
 
 # We don't actually know what's available in any given region
 _PLAUSIBLE_ZONES = ascii_lowercase
@@ -102,7 +102,7 @@
         contextFactory = VerifyingContextFactory(_CURRENT_IMAGE_HOST)
     else:
         contextFactory = None
-    d = getPage(uri, contextFactory=contextFactory)
+    d = get_page(uri, contextFactory=contextFactory)
     d.addErrback(handle_404)
     d.addCallback(extract_ami)
     return d
 
=== modified file 'juju/providers/local/files.py'
--- juju/providers/local/files.py	2012-09-28 06:13:47 +0000
+++ juju/providers/local/files.py	2012-11-23 21:00:27 +0000
@@ -3,10 +3,10 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.error import ConnectionRefusedError
-from twisted.web.client import getPage
 
 from juju.errors import ProviderError, FileNotFound
 from juju.lib import serializer
+from juju.lib.http_client import get_page
 from juju.lib.service import TwistedDaemonService
 from juju.providers.common.files import FileStorage
 
@@ -55,7 +55,7 @@
     def is_serving(self):
         try:
             storage = LocalStorage(self._storage_dir)
-            yield getPage((yield storage.get_url(SERVER_URL_KEY)))
+            yield get_page((yield storage.get_url(SERVER_URL_KEY)))
             returnValue(True)
         except ConnectionRefusedError:
             returnValue(False)
 
=== modified file 'juju/providers/orchestra/files.py'
--- juju/providers/orchestra/files.py	2011-10-17 07:43:09 +0000
+++ juju/providers/orchestra/files.py	2012-11-23 21:00:27 +0000
@@ -2,10 +2,10 @@
 import urllib
 import urlparse
 
-from twisted.web.client import getPage
 from twisted.web.error import Error
 
 from juju.errors import FileNotFound, ProviderError
+from juju.lib.http_client import get_page
 from juju.providers.common.utils import convert_unknown_error
 from juju.providers.orchestra.digestauth import (
     DigestAuthenticator, get_page_auth)
@@ -60,7 +60,7 @@
         :raises: :exc:`juju.errors.FileNotFound` if the file doesn't exist
         """
         url = self.get_url(name)
-        d = getPage(url)
+        d = get_page(url)
         d.addCallback(StringIO)
         d.addErrback(_convert_error, "GET", url, {404: FileNotFound(url)})
         return d
 
=== modified file 'juju/providers/orchestra/tests/data/bootstrap_user_data'
--- juju/providers/orchestra/tests/data/bootstrap_user_data	2012-08-23 16:14:42 +0000
+++ juju/providers/orchestra/tests/data/bootstrap_user_data	2012-11-23 21:00:27 +0000
@@ -3,8 +3,8 @@
 machine-data: {juju-provider-type: orchestra, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: '0'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
-  default-jre-headless, zookeeper, zookeeperd, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper,
+  default-jre-headless, zookeeper, zookeeperd, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p /var/log/juju, 'juju-admin initialize
     --instance-id=winston-uid --admin-identity=admin:qRBXC1ubEEUqRL6wcBhgmc9xkaY=
     --constraints-data=e29yY2hlc3RyYS1jbGFzc2VzOiAnZm9vLGJhcicsIHByb3ZpZGVyLXR5cGU6IG9yY2hlc3RyYSwgdWJ1bnR1LXNlcmllczogYml6YXJyZX0K
 
=== modified file 'juju/providers/orchestra/tests/data/launch_user_data'
--- juju/providers/orchestra/tests/data/launch_user_data	2012-08-23 16:14:42 +0000
+++ juju/providers/orchestra/tests/data/launch_user_data	2012-11-23 21:00:27 +0000
@@ -3,7 +3,7 @@
 machine-data: {juju-provider-type: orchestra, juju-zookeeper-hosts: 'jennifer:2181',
   machine-id: '42'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-zookeeper, juju, python-txaws]
 runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
     /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
 
 
=== modified file 'juju/unit/address.py'
--- juju/unit/address.py	2012-10-05 17:49:27 +0000
+++ juju/unit/address.py	2012-11-23 21:00:27 +0000
@@ -1,5 +1,6 @@
 """Service units have both a public and private address.
 """
+import os
 import subprocess
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
@@ -15,7 +16,9 @@
     settings = GlobalSettingsStateManager(client)
     provider_type = yield settings.get_provider_type()
     if provider_type == "ec2":
-        returnValue(EC2UnitAddress())
+        address = EC2UnitAddress()
+        address.private = os.environ.get("JUJU_PRIVATE") is not None
+        returnValue(address)
     if provider_type in ("openstack", "openstack_s3"):
         returnValue(OpenStackUnitAddress())
     elif provider_type == "local":
@@ -50,6 +53,10 @@
 
 class EC2UnitAddress(UnitAddress):
 
+    def __init__(self, *args, **kwargs):
+        super(EC2UnitAddress, self).__init__(*args, **kwargs)
+        self.private = False
+
     @inlineCallbacks
     def get_private_address(self):
         content = yield client.getPage(
@@ -58,8 +65,12 @@
 
     @inlineCallbacks
     def get_public_address(self):
+        if self.private:
+            field = "local-ipv4"
+        else:
+            field = "public-hostname"
         content = yield client.getPage(
-            "http://169.254.169.254/latest/meta-data/public-hostname")
+            "http://169.254.169.254/latest/meta-data/%s" % field)
         returnValue(content.strip())
 
 
 
=== modified file 'juju/unit/charm.py'
--- juju/unit/charm.py	2012-03-21 12:54:28 +0000
+++ juju/unit/charm.py	2012-11-23 21:00:27 +0000
@@ -3,12 +3,12 @@
 import shutil
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.web.client import downloadPage
 from twisted.web.error import Error
 
 from juju.errors import FileNotFound
 from juju.charm.bundle import CharmBundle
 from juju.lib import under
+from juju.lib.http_client import download_page
 from juju.state.charm import CharmStateManager
 
 
@@ -33,7 +33,7 @@
         shutil.copyfileobj(open(file_path), open(local_charm_path, "w"))
     else:
         try:
-            yield downloadPage(charm_state.bundle_url, local_charm_path)
+            yield download_page(charm_state.bundle_url, local_charm_path)
         except Error:
             raise FileNotFound(charm_state.bundle_url)
 
 
=== modified file 'juju/unit/deploy.py'
--- juju/unit/deploy.py	2012-04-04 20:21:44 +0000
+++ juju/unit/deploy.py	2012-11-23 21:00:27 +0000
@@ -80,6 +80,11 @@
         deployment = self.deploy_factory(
             service_unit_name, self.juju_directory)
 
+        for env in ("http_proxy", "https_proxy", "JUJU_PRIVATE"):
+            value = os.environ.get(env)
+            if value:
+                deployment.set_env(env, value)
+
         log.debug("Using %r for %s in %s",
                   deployment,
                   service_unit_name,
 
=== modified file 'juju/unit/tests/test_address.py'
--- juju/unit/tests/test_address.py	2012-10-05 17:49:27 +0000
+++ juju/unit/tests/test_address.py	2012-11-23 21:00:27 +0000
@@ -1,3 +1,4 @@
+import os
 import subprocess
 import zookeeper
 
@@ -30,6 +31,14 @@
     def test_get_ec2_address(self):
         address = yield self.get_address_for("ec2")
         self.assertTrue(isinstance(address, EC2UnitAddress))
+        self.assertFalse(address.private)
+
+    @inlineCallbacks
+    def test_get_ec2_address_private_mode(self):
+        os.environ.setdefault("JUJU_PRIVATE", "private")
+        address = yield self.get_address_for("ec2")
+        self.assertTrue(address.private)
+        del os.environ["JUJU_PRIVATE"]
 
     @inlineCallbacks
     def test_get_openstack_address(self):
@@ -118,6 +127,23 @@
         self.assertEqual(
             (yield self.address.get_public_address()), "foobar")
 
+    @inlineCallbacks
+    def test_get_address_private_mode(self):
+        urls = [
+            "http://169.254.169.254/latest/meta-data/local-hostname",
+            "http://169.254.169.254/latest/meta-data/local-ipv4"]
+
+        def verify_args(url):
+            self.assertEqual(urls.pop(0), url)
+            return succeed("foobar\n")
+
+        self.address.private = True
+        self.patch(client, "getPage", verify_args)
+        self.assertEqual(
+            (yield self.address.get_private_address()), "foobar")
+        self.assertEqual(
+            (yield self.address.get_public_address()), "foobar")
+        self.address.private = False
 
 class OpenStackAddressTest(TestCase):