Merge lp:~hazmat/pyjuju/local-origin-passthrough into lp:pyjuju

[Kapil Thangavelu]

Local provider should respect juju-origin

Minor fixes to pass juju origin to the machine agent, and to juju-create
to utilize jujuorigin for lp branch names.

[lp:~hazmat/pyjuju/local-origin-passthrough]

411. By Kapil Thangavelu on 2011-09-30

use default origin util func if none specified

412. By Kapil Thangavelu on 2011-09-30

Merged unit-relation-with-addr into local-origin-passthrough.

413. By Kapil Thangavelu on 2011-09-30

fix some local provider problems

414. By Kapil Thangavelu on 2011-09-30

unit container deploy pulls origin from environment

415. By Kapil Thangavelu on 2011-10-01

log master container customization for foresenic analysis, various sundry fixes for juju-origin in a container

416. By Kapil Thangavelu on 2011-10-01

add python-yaml dep for branch installs, and switch address map s/lxc/local

417. By Kapil Thangavelu on 2011-10-01

fix up customize log test

418. By Kapil Thangavelu on 2011-10-04

merge pipeline, resolve conflict

Unmerged revisions

=== modified file 'docs/source/provider-configuration-ec2.rst'
--- docs/source/provider-configuration-ec2.rst	2011-09-15 17:41:55 +0000
+++ docs/source/provider-configuration-ec2.rst	2011-09-30 05:02:23 +0000
@@ -24,9 +24,15 @@
         An S3 bucket unique to the environment, where some runtime metadata and
         charms are stored.
 
-    juju-branch:
-        Allow a juju bzr branch to be utilized for all machines within an
-        environment.
+    juju-origin:
+        Defines where juju should be obtained for installing in
+        machines. Can be set to a "lp:..." branch url, to "ppa" for
+        getting packages from the official juju PPA, or to "distro"
+        for using packages from the official Ubuntu repositories.
+
+        If this option is not set, juju will attempt to detect the
+        correct origin based on its run location and the installed
+        juju package.
 
     default-instance-type:
         The instance type to be used for machines launched within the juju

=== modified file 'juju/lib/lxc/data/juju-create'
--- juju/lib/lxc/data/juju-create	2011-09-30 01:57:00 +0000
+++ juju/lib/lxc/data/juju-create	2011-09-30 05:02:23 +0000
@@ -69,7 +69,7 @@
 
     if [ $JUJU_ORIGIN = "ppa" ]; then
         echo "Using juju PPA for container"
-    elif [ $JUJU_ORIGIN = "branch" ]; then
+    elif [[ $JUJU_ORIGIN == lp:* ]]; then
         echo "Using juju Branch $JUJU_SOURCE"
     elif [ $JUJU_ORIGIN = "distro" ]; then
         echo "Using juju distribution packages"
@@ -87,10 +87,10 @@
         echo y | apt-add-repository ppa:juju/pkgs
         apt-get update
         apt-get install --force-yes -y juju python-txzookeeper
-    elif [ $JUJU_ORIGIN = "branch" ]; then
+    elif [[ $JUJU_ORIGIN = lp:* ]]; then
         apt-get install --force-yes -y python-txzookeeper
         mkdir /usr/lib/juju
-        bzr branch $JUJU_SOURCE /usr/lib/juju/juju
+        bzr branch $JUJU_ORIGIN /usr/lib/juju/juju
         bash -c "cd /usr/lib/juju/juju && sudo python setup.py develop"
     elif [ $JUJU_ORIGIN = "distro" ]; then
         apt-get install --force-yes -y juju python-txzookeeper

=== modified file 'juju/providers/common/cloudinit.py'
--- juju/providers/common/cloudinit.py	2011-09-23 20:35:02 +0000
+++ juju/providers/common/cloudinit.py	2011-09-30 05:02:23 +0000
@@ -1,3 +1,5 @@
+from subprocess import Popen, PIPE
+
 from juju.errors import CloudInitError
 from juju.providers.common.utils import format_cloud_init
 from juju.state.auth import make_identity
@@ -54,6 +56,80 @@
         % zookeeper_hosts]
 
 
+def _get_apt_cache_policy():
+    return Popen(["apt-cache", "policy", "juju"], stdout=PIPE).\
+        communicate()[0]
+
+
+def _parse_apt_cache_policy(data):
+    """Flatten apt-cache policy output to generate (key, value) pairs."""
+
+    # Need to parse in two different phases, so set up iterator now
+    data = iter(data.split("\n"))
+
+    # Parse preamble
+    for row in data:
+        split = row.split(":", 1)
+        if len(split) != 2:
+            yield None, None
+        k, v = split[0].strip(), split[1].strip()
+        yield k, v
+        if k == "Version table":
+            break
+    
+    # Parse version table into tag, priorities
+    tag = None
+    for row in data:
+        row = row.strip()
+        if row.startswith("***"):
+            tag = row
+        elif tag:
+            yield tag, row
+
+
+def parse_juju_origin(data):
+    """Parse output of apt-cache to determine how juju was installed."""
+    parse = _parse_apt_cache_policy(data)
+    k, _ = parse.next()
+    if k != "juju":
+        # Sanity check: no record at all, the only possibility is that
+        # this being run as a branch
+        return "branch", "lp:juju"
+
+    version = None
+    for k, v in parse:
+        if k == "Installed":
+            if v == "(none)":
+                return "branch", "lp:juju"
+            version = v
+        if k == "Version table":
+            break
+
+    for tag, priority in parse:
+        if (version in tag and 
+            "http://ppa.launchpad.net/juju/pkgs/" in priority):
+            return "ppa", None
+
+    return "distro", None
+
+
+def _get_default_origin():
+    """Select the best fit for running juju on cloudinit.
+
+    Used if not otherwise specified by juju-origin.
+    """
+    import juju
+    if not juju.__file__.startswith("/usr/"):
+        return "lp:juju"
+    origin, source = parse_juju_origin(_get_apt_cache_policy())
+    if origin == "branch":
+        return source
+    elif origin == "ppa":
+        return _PPA
+    else:
+        return _DISTRO
+
+
 class CloudInit(object):
     """Encapsulates juju-specific machine initialisation.
 
@@ -65,7 +141,7 @@
         self._machine_id = None
         self._instance_id = None
         self._provider_type = None
-        self._source = _PPA
+        self._source = _get_default_origin()
         self._ssh_keys = []
         self._provision = False
         self._zookeeper = False
@@ -103,7 +179,7 @@
             or fewer than one options, are specified.
 
         Note that you don't need to call this method; the juju source
-        defaults to the juju PPA.
+        defaults to what is returned by `get_default_origin`.
         """
         if len(filter(None, (branch, ppa, distro))) != 1:
             raise CloudInitError("Please specify one source")

=== modified file 'juju/providers/common/launch.py'
--- juju/providers/common/launch.py	2011-09-22 13:23:00 +0000
+++ juju/providers/common/launch.py	2011-09-30 05:02:23 +0000
@@ -76,8 +76,15 @@
         cloud_init.add_ssh_key(get_user_authorized_keys(config))
         cloud_init.set_machine_id(machine_id)
         cloud_init.set_zookeeper_machines(zookeepers)
-        if config.get("juju-branch"):
-            cloud_init.set_juju_source(config["juju-branch"])
+        origin = config.get("juju-origin")
+        if origin:
+            if origin.startswith("lp:"):
+                cloud_init.set_juju_source(branch=origin)
+            elif origin == "ppa":
+                cloud_init.set_juju_source(ppa=True)
+            else:
+                # Ignore other values, just use the distro for sanity
+                cloud_init.set_juju_source(distro=True)
         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	2011-09-23 20:35:02 +0000
+++ juju/providers/common/tests/data/cloud_init_bootstrap	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: passport}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}

=== modified file 'juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers'
--- juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers	2011-09-23 20:35:02 +0000
+++ juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 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'}

=== added file 'juju/providers/common/tests/data/cloud_init_branch_trunk'
--- juju/providers/common/tests/data/cloud_init_branch_trunk	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_branch_trunk	2011-09-30 05:02:23 +0000
@@ -0,0 +1,17 @@
+#cloud-config
+apt-update: true
+apt-upgrade: true
+apt_sources:
+- {source: 'ppa:juju/pkgs'}
+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-argparse, python-txaws,
+  python-zookeeper]
+runcmd: [sudo apt-get install -y python-txzookeeper, sudo mkdir -p /usr/lib/juju,
+  'cd /usr/lib/juju && sudo /usr/bin/bzr co 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, 'JUJU_MACHINE_ID=passport JUJU_ZOOKEEPER=cotswold:2181,longleat:2181
+    python -m juju.agents.machine -n --logfile=/var/log/juju/machine-agent.log
+    --pidfile=/var/run/juju/machine-agent.pid']
+ssh_authorized_keys: [chubb]

=== modified file 'juju/providers/common/tests/data/cloud_init_normal'
--- juju/providers/common/tests/data/cloud_init_normal	2011-09-15 19:29:57 +0000
+++ juju/providers/common/tests/data/cloud_init_normal	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 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'}

=== added file 'juju/providers/common/tests/data/cloud_init_ppa'
--- juju/providers/common/tests/data/cloud_init_ppa	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_ppa	2011-09-30 05:02:23 +0000
@@ -0,0 +1,15 @@
+#cloud-config
+apt-update: true
+apt-upgrade: true
+apt_sources:
+- {'source': 'ppa:juju/pkgs'}
+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-argparse, python-txaws,
+  python-zookeeper]
+runcmd: [sudo apt-get -y install juju, 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
+    --pidfile=/var/run/juju/machine-agent.pid']
+ssh_authorized_keys: [chubb]

=== modified file 'juju/providers/common/tests/test_cloudinit.py'
--- juju/providers/common/tests/test_cloudinit.py	2011-09-22 13:23:00 +0000
+++ juju/providers/common/tests/test_cloudinit.py	2011-09-30 05:02:23 +0000
@@ -1,12 +1,14 @@
 import os
+import stat
 
 import yaml
 
 from juju.errors import CloudInitError
 from juju.lib.testing import TestCase
-from juju.providers.common.cloudinit import CloudInit
+from juju.providers.common.cloudinit import CloudInit, parse_juju_origin
 from juju.providers.dummy import DummyMachine
 
+
 DATA_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "data")
 
 
@@ -30,6 +32,7 @@
         cloud_init.set_provider_type("dummy")
         cloud_init.set_instance_id_accessor("token")
         cloud_init.set_zookeeper_secret("seekrit")
+        cloud_init.set_juju_source(distro=True)
         if with_zookeepers:
             cloud_init.set_zookeeper_machines([
                 DummyMachine("blah", "blah", "cotswold"),
@@ -74,12 +77,34 @@
             self.assertEquals(str(error), "Please specify one source")
 
     def test_render_normal(self):
-        self.assert_render(self.construct_normal(), "cloud_init_normal")
+        path = os.environ.get("PATH", "")
+        alt_apt_cache_path = self.makeDir()
+        filename = os.path.join(alt_apt_cache_path, "apt-cache")
+        with open(filename, "w") as f:
+            f.write(
+                "#!/bin/bash\n"
+                "cat <<EOF\n"
+                "juju:\n"
+                "  Installed: good-magic-1.0\n"
+                "  Candidate: good-magic-1.0\n"
+                "  Version table:\n"
+                " *** good-magic-1.0\n"
+                "        500 http://us.archive.ubuntu.com/ubuntu/ "
+                "natty/main amd64 Packages\n"
+                "        100 /var/lib/dpkg/status\n"
+                "EOF\n")
+        os.chmod(filename, stat.S_IEXEC | stat.S_IREAD)
+        updated_path = alt_apt_cache_path + ":" + path
+        self.change_environment(PATH=updated_path)
+        import juju
+        self.patch(juju, "__file__",
+                       "/usr/lib/pymodules/python2.7/juju/__init__.pyc")
+        self.assert_render(self.construct_normal(), "cloud_init_distro")
 
     def test_render_ppa_source(self):
         cloud_init = self.construct_normal()
         cloud_init.set_juju_source(ppa=True)
-        self.assert_render(cloud_init, "cloud_init_normal")
+        self.assert_render(cloud_init, "cloud_init_ppa")
 
     def test_render_distro_source(self):
         cloud_init = self.construct_normal()
@@ -91,9 +116,90 @@
         cloud_init.set_juju_source(branch="lp:blah/juju/blah-blah")
         self.assert_render(cloud_init, "cloud_init_branch")
 
+    def test_render_branch_source_if_not_installed(self):
+        import juju
+        self.patch(juju, "__file__", "/not/installed/under/usr")
+        cloud_init = self.construct_normal()
+        self.assert_render(cloud_init, "cloud_init_branch_trunk")
+
     def test_render_bootstrap(self):
         self.assert_render(self.construct_bootstrap(), "cloud_init_bootstrap")
 
     def test_render_bootstrap_with_zookeepers(self):
         self.assert_render(
             self.construct_bootstrap(True), "cloud_init_bootstrap_zookeepers")
+
+
+class ParseJujuOriginTest(TestCase):
+
+    def test_distro_installed(self):
+        data = (
+            "juju:\n"
+            "  Installed: good-magic-1.0\n"
+            "  Candidate: good-magic-1.0\n"
+            "  Version table:\n"
+            " *** good-magic-1.0 0\n"
+            "        500 http://us.archive.ubuntu.com/ubuntu/ "
+            "natty/main amd64 Packages\n"
+            "        100 /var/lib/dpkg/status\n")
+
+        origin, source = parse_juju_origin(data)
+        self.assertEqual(origin, "distro")
+        self.assertEqual(source, None)
+
+    def test_multiple_versions_available(self):
+        data = (
+            "juju:\n"
+            "  Installed: 0.5+bzr366-1juju1~natty1\n"
+            "  Candidate: 0.5+bzr366-1juju1~natty1\n"
+            "  Version table:\n"
+            " *** bad-magic-0.5 0\n"
+            "        500 http://us.archive.ubuntu.com/ubuntu/ "
+            "natty/main amd64 Packages\n"
+            "        100 /var/lib/dpkg/status\n"
+            " *** 0.5+bzr366-1juju1~natty1 0\n"
+            "        500 http://ppa.launchpad.net/juju/pkgs/ubuntu/ "
+            "natty/main amd64 Packages\n"
+            " *** 0.5+bzr356-1juju1~natty1 0\n"
+            "        500 http://ppa.launchpad.net/juju/pkgs/ubuntu/ "
+            "natty/main amd64 Packages\n")
+
+        origin, source = parse_juju_origin(data)
+        self.assertEqual(origin, "ppa")
+        self.assertEqual(source, None)
+
+    def test_distro_not_installed(self):
+        data = (
+            "juju:\n"
+            "  Installed: (none)\n"
+            "  Candidate: good-magic-1.0\n"
+            "  Version table:\n"
+            " *** good-magic-1.0 0\n"
+            "        500 http://us.archive.ubuntu.com/ubuntu/ "
+            "natty/main amd64 Packages\n"
+            "        100 /var/lib/dpkg/status\n")
+
+        origin, source = parse_juju_origin(data)
+        self.assertEqual(origin, "branch")
+        self.assertEqual(source, "lp:juju")
+
+    def test_ppa_installed(self):
+        data = (
+            "juju:\n"
+            "  Installed: 0.5+bzr356-1juju1~natty1\n"
+            "  Candidate: 0.5+bzr356-1juju1~natty1\n"
+            "  Version table:\n"
+            " *** 0.5+bzr356-1juju1~natty1 0\n"
+            "        500 http://ppa.launchpad.net/juju/pkgs/ubuntu/ "
+            "natty/main amd64 Packages\n"
+            "        100 /var/lib/dpkg/status\n")
+
+        origin, source = parse_juju_origin(data)
+        self.assertEqual(origin, "ppa")
+        self.assertEqual(source, None)
+
+    def test_juju_package_is_unknown(self):
+        data = "N: Unable to locate package juju"
+        origin, source = parse_juju_origin(data)
+        self.assertEqual(origin, "branch")
+        self.assertEqual(source, "lp:juju")

=== modified file 'juju/providers/ec2/tests/common.py'
--- juju/providers/ec2/tests/common.py	2011-09-22 13:23:00 +0000
+++ juju/providers/ec2/tests/common.py	2011-09-30 05:02:23 +0000
@@ -22,6 +22,7 @@
 
     def get_config(self):
         return {"type": "ec2",
+                "juju-origin": "distro",
                 "admin-secret": "magic-beans",
                 "access-key": "0f62e973d5f8",
                 "secret-key": "3e5a7c653f59",

=== modified file 'juju/providers/ec2/tests/data/bootstrap_cloud_init'
--- juju/providers/ec2/tests/data/bootstrap_cloud_init	2011-09-23 20:35:02 +0000
+++ juju/providers/ec2/tests/data/bootstrap_cloud_init	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: '0'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}

=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init'
--- juju/providers/ec2/tests/data/launch_cloud_init	2011-09-15 19:29:57 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 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'}

=== added file 'juju/providers/ec2/tests/data/launch_cloud_init_branch'
--- juju/providers/ec2/tests/data/launch_cloud_init_branch	1970-01-01 00:00:00 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init_branch	2011-09-30 05:02:23 +0000
@@ -0,0 +1,20 @@
+#cloud-config
+apt-update: true
+apt-upgrade: true
+apt_sources:
+- {source: 'ppa:juju/pkgs'}
+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-argparse, python-txaws,
+  python-zookeeper]
+runcmd: [sudo apt-get install -y python-txzookeeper,
+         sudo mkdir -p /usr/lib/juju,
+         'cd /usr/lib/juju && sudo /usr/bin/bzr co 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,
+         'JUJU_MACHINE_ID=1 JUJU_ZOOKEEPER=es.example.internal:2181
+    python -m juju.agents.machine -n --logfile=/var/log/juju/machine-agent.log
+    --pidfile=/var/run/juju/machine-agent.pid']
+ssh_authorized_keys: [zebra]

=== added file 'juju/providers/ec2/tests/data/launch_cloud_init_ppa'
--- juju/providers/ec2/tests/data/launch_cloud_init_ppa	1970-01-01 00:00:00 +0000
+++ juju/providers/ec2/tests/data/launch_cloud_init_ppa	2011-09-30 05:02:23 +0000
@@ -0,0 +1,15 @@
+#cloud-config
+apt-update: true
+apt-upgrade: true
+apt_sources:
+- {source: 'ppa:juju/pkgs'}
+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-argparse, python-txaws,
+  python-zookeeper]
+runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir
+    -p /var/log/juju, 'JUJU_MACHINE_ID=1 JUJU_ZOOKEEPER=es.example.internal:2181
+    python -m juju.agents.machine -n --logfile=/var/log/juju/machine-agent.log
+    --pidfile=/var/run/juju/machine-agent.pid']
+ssh_authorized_keys: [zebra]

=== modified file 'juju/providers/ec2/tests/test_bootstrap.py'
--- juju/providers/ec2/tests/test_bootstrap.py	2011-09-22 13:23:00 +0000
+++ juju/providers/ec2/tests/test_bootstrap.py	2011-09-30 05:02:23 +0000
@@ -13,6 +13,7 @@
 
 from .common import EC2TestMixin, EC2MachineLaunchMixin
 
+
 DATA_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "data")
 
 

=== modified file 'juju/providers/ec2/tests/test_launch.py'
--- juju/providers/ec2/tests/test_launch.py	2011-09-16 00:36:31 +0000
+++ juju/providers/ec2/tests/test_launch.py	2011-09-30 05:02:23 +0000
@@ -21,10 +21,11 @@
 class EC2MachineLaunchTest(EC2TestMixin, EC2MachineLaunchMixin, TestCase):
 
     def _mock_launch(self, instance, expect_ami="ami-default",
-                     expect_instance_type="m1.small"):
+                     expect_instance_type="m1.small",
+                     cloud_init="launch_cloud_init"):
 
         def verify_user_data(data):
-            expect_path = os.path.join(DATA_DIR, "launch_cloud_init")
+            expect_path = os.path.join(DATA_DIR, cloud_init)
             with open(expect_path) as f:
                 expect_cloud_init = yaml.load(f.read())
             self.assertEquals(yaml.load(data), expect_cloud_init)
@@ -75,6 +76,63 @@
         return d
 
     @inlineCallbacks
+    def test_provider_launch_using_branch(self):
+        """Can use a juju branch to launch a machine"""
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([]))
+        self._mock_create_group()
+        self._mock_create_machine_group("1")
+        self._mock_launch_utils(region="us-east-1")
+        self._mock_get_zookeeper_hosts()
+        self._mock_launch(
+            self.get_instance("i-foobar"),
+            cloud_init="launch_cloud_init_branch")
+        self.mocker.replay()
+
+        provider = self.get_provider()
+        provider.config["juju-origin"] = "lp:~wizard/juju-juicebar"
+        machines = yield provider.start_machine({"machine-id": "1"})
+        self.assert_machine(machines[0], "i-foobar", "")
+
+    @inlineCallbacks
+    def test_provider_launch_using_ppa(self):
+        """Can use the juju ppa to launch a machine"""
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([]))
+        self._mock_create_group()
+        self._mock_create_machine_group("1")
+        self._mock_launch_utils(region="us-east-1")
+        self._mock_get_zookeeper_hosts()
+        self._mock_launch(
+            self.get_instance("i-foobar"),
+            cloud_init="launch_cloud_init_ppa")
+        self.mocker.replay()
+
+        provider = self.get_provider()
+        provider.config["juju-origin"] = "ppa"
+        machines = yield provider.start_machine({"machine-id": "1"})
+        self.assert_machine(machines[0], "i-foobar", "")
+
+    @inlineCallbacks
+    def test_provider_launch_using_explicit_distro(self):
+        """Can set juju-origin explicitly to `distro`"""
+        self.ec2.describe_security_groups()
+        self.mocker.result(succeed([]))
+        self._mock_create_group()
+        self._mock_create_machine_group("1")
+        self._mock_launch_utils(region="us-east-1")
+        self._mock_get_zookeeper_hosts()
+        self._mock_launch(
+            self.get_instance("i-foobar"),
+            cloud_init="launch_cloud_init")
+        self.mocker.replay()
+
+        provider = self.get_provider()
+        provider.config["juju-origin"] = "distro"
+        machines = yield provider.start_machine({"machine-id": "1"})
+        self.assert_machine(machines[0], "i-foobar", "")
+
+    @inlineCallbacks
     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")

=== modified file 'juju/providers/local/agent.py'
--- juju/providers/local/agent.py	2011-09-27 16:51:50 +0000
+++ juju/providers/local/agent.py	2011-09-30 05:02:23 +0000
@@ -15,8 +15,7 @@
     def __init__(
         self, pid_file, zookeeper_hosts=None, machine_id="0",
         log_file=None, juju_directory="/var/lib/juju",
-        juju_unit_namespace="",
-        public_key=None):
+        juju_unit_namespace="", public_key=None, juju_origin="ppa"):
         """
         :param pid_file: Path to file used to store process id.
         :param machine_id: machine id for the local machine.
@@ -37,6 +36,7 @@
         self._juju_unit_namespace = juju_unit_namespace
         self._log_file = log_file
         self._public_key = public_key
+        self._juju_origin = juju_origin
 
     @inlineCallbacks
     def start(self):
@@ -51,6 +51,7 @@
         # to the command.
         args = ["sudo",
                 "JUJU_ZOOKEEPER=%s" % self._zookeeper_hosts,
+                "JUJU_ORIGIN=%s" % self._juju_origin,
                 "JUJU_MACHINE_ID=%s" % self._machine_id,
                 "JUJU_HOME=%s" % self._juju_directory,
                 "JUJU_UNIT_NS=%s" % self._juju_unit_namespace,
@@ -60,7 +61,8 @@
                 "--logfile", self._log_file]
 
         if self._public_key:
-            args.insert(1, "JUJU_PUBLIC_KEY=%s" % pipes.quote(self._public_key))
+            args.insert(
+                1, "JUJU_PUBLIC_KEY=%s" % pipes.quote(self._public_key))
 
         yield deferToThread(subprocess.check_call, args)
 

=== modified file 'juju/providers/local/tests/test_agent.py'
--- juju/providers/local/tests/test_agent.py	2011-09-27 16:51:50 +0000
+++ juju/providers/local/tests/test_agent.py	2011-09-30 05:02:23 +0000
@@ -47,6 +47,7 @@
             dict(JUJU_ZOOKEEPER=get_test_zookeeper_address(),
                  JUJU_MACHINE_ID="0",
                  JUJU_HOME=juju_directory,
+                 JUJU_ORIGIN="ppa",
                  JUJU_UNIT_NS="ns1"))
 
     @inlineCallbacks

=== modified file 'juju/providers/orchestra/tests/common.py'
--- juju/providers/orchestra/tests/common.py	2011-09-22 13:23:00 +0000
+++ juju/providers/orchestra/tests/common.py	2011-09-30 05:02:23 +0000
@@ -13,7 +13,9 @@
 
 DATA_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "data")
 
-CONFIG = {"orchestra-server": "somewhe.re",
+CONFIG = {"type": "orchestra",
+          "juju-origin": "distro",
+          "orchestra-server": "somewhe.re",
           "orchestra-user": "user",
           "orchestra-pass": "pass",
           "acquired-mgmt-class": "acquired",

=== modified file 'juju/providers/orchestra/tests/data/bootstrap_user_data'
--- juju/providers/orchestra/tests/data/bootstrap_user_data	2011-09-23 20:35:02 +0000
+++ juju/providers/orchestra/tests/data/bootstrap_user_data	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 machine-data: {juju-provider-type: orchestra, juju-zookeeper-hosts: 'localhost:2181',
   machine-id: '0'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}

=== modified file 'juju/providers/orchestra/tests/data/launch_user_data'
--- juju/providers/orchestra/tests/data/launch_user_data	2011-09-16 14:07:03 +0000
+++ juju/providers/orchestra/tests/data/launch_user_data	2011-09-30 05:02:23 +0000
@@ -1,8 +1,6 @@
 #cloud-config
 apt-update: true
 apt-upgrade: true
-apt_sources:
-- {source: 'ppa:juju/pkgs'}
 machine-data: {juju-provider-type: orchestra, juju-zookeeper-hosts: 'jennifer:2181',
   machine-id: '42'}
 output: {all: '| tee -a /var/log/cloud-init-output.log'}

=== modified file 'juju/state/relation.py'
--- juju/state/relation.py	2011-09-15 18:50:23 +0000
+++ juju/state/relation.py	2011-09-30 05:02:23 +0000
@@ -218,6 +218,10 @@
     def add_unit_state(self, unit_state):
         """Add a unit to the service relation.
 
+        This api is intended for use by the unit agent, as it
+        also creates an ephemeral presence node, denoting the
+        active existance of the unit in the relation.
+
         returns a unit relation state.
         """
         settings_path = "/relations/%s/settings/%s" % (
@@ -225,11 +229,23 @@
 
         # We create settings node first, so that presence node events
         # have a chance to inspect state.
+
+        # Prepopulate the relation node with the node's private address.
+        private_address = yield unit_state.get_private_address()
         try:
-            yield self._client.create(settings_path)
+            yield self._client.create(
+                settings_path,
+                yaml.safe_dump({"private-address": private_address}))
         except zookeeper.NodeExistsException:
-            # previous persistent settings are not an error.
-            pass
+            # previous persistent settings are not an error, but
+            # update the unit address
+            def update_address(content, stat):
+                unit_map = yaml.load(content)
+                if not unit_map:
+                    unit_map = {}
+                unit_map["private-address"] = private_address
+                return yaml.safe_dump(unit_map)
+            yield retry_change(self._client, settings_path, update_address)
 
         # Update the unit name -> id mapping on the relation node
         def update_unit_mapping(content, stat):

=== modified file 'juju/state/tests/test_relation.py'
--- juju/state/tests/test_relation.py	2011-09-28 10:38:16 +0000
+++ juju/state/tests/test_relation.py	2011-09-30 05:02:23 +0000
@@ -577,6 +577,8 @@
         self.client.exists_and_watch(settings_path)[1].addCallback(
             lambda result: append_event("settings", result))
 
+        yield unit_state.set_private_address("foobar.local")
+
         # add the unit agent
         yield self.service1_relation.add_unit_state(unit_state)
 
@@ -597,6 +599,10 @@
             unit_map,
             {unit_state.internal_id: unit_state.unit_name})
 
+        content, stat = yield self.client.get(settings_path)
+        self.assertEqual(
+            yaml.load(content), {"private-address": "foobar.local"})
+
     @inlineCallbacks
     def test_presence_node_is_ephemeral(self):
         """
@@ -648,17 +654,26 @@
 
     @inlineCallbacks
     def test_add_unit_state_with_preexisting_settings(self):
-        """A unit coming backup retains its existing settings."""
+        """A unit coming backup retains its existing settings.
+
+        With the exception of the unit address, which is always
+        kept current on subsequent joinings.
+        """
         unit_state = yield self.service_state1.add_unit_state()
         settings_path = "/relations/%s/settings/%s" % (
             self.relation_state.internal_id,
             unit_state.internal_id)
 
-        data = {"hello": "world"}
+        data = {"hello": "world", "private-address": "foobar.local"}
         yield self.client.create(settings_path, yaml.dump(data))
+
+        yield unit_state.set_private_address("northwest.local")
         yield self.service1_relation.add_unit_state(unit_state)
 
         node_data, stat = yield self.client.get(settings_path)
+
+        # The unit address has been updated to current
+        data["private-address"] = "northwest.local"
         self.assertEqual(node_data, yaml.dump(data))
 
         data, stat = yield self.client.get(
@@ -731,7 +746,7 @@
         unit_relation = states["unit_relation"]
 
         data = yield unit_relation.get_data()
-        self.assertEqual(data, "")
+        self.assertEqual(yaml.load(data), {"private-address": None})
 
         unit_relation_path = self.get_unit_settings_path(states)
         self.client.set(unit_relation_path, yaml.dump(dict(hello="world")))