Merge lp:~hazmat/pyjuju/proposed-support into lp:pyjuju

[Kapil Thangavelu]

Proposed apt repository pocket support for testing updates.

Adds a new juju-origin value of 'proposed' which enables the
proposed pocket against the current environment series when launching
machines.

[Kapil Thangavelu (hazmat)]

Please take a look.

[Clint Byrum (clint-fewbar)]

Hi Kapil, this is great! Except one thing:

124 + if self._origin == PROPOSED:
125 + return ["deb $MIRROR $RELEASE-proposed main"]

Juju is not in 'main' yet. You'll need to enable universe as well. You can do so by adding just 'universe' as a word after 'main'.

Once that is done, +1!

review: Needs Fixing

[lp:~hazmat/pyjuju/proposed-support]

488. By Kapil Thangavelu on 2012-05-29

enable proposed on main AND universe.

[Kapil Thangavelu (hazmat)]

Updated to include universe, i'm going to go ahead and merge this then.

On Sat, May 26, 2012 at 1:24 AM, Clint Byrum <email address hidden> wrote:

> Review: Needs Fixing
>
> Hi Kapil, this is great! Except one thing:
>
> 124 + if self._origin == PROPOSED:
> 125 + return ["deb $MIRROR $RELEASE-proposed main"]
>
> Juju is not in 'main' yet. You'll need to enable universe as well. You can
> do so by adding just 'universe' as a word after 'main'.
>
> Once that is done, +1!
> --
> https://code.launchpad.net/~hazmat/juju/proposed-support/+merge/107404
> You are the owner of lp:~hazmat/juju/proposed-support.
>

[Clint Byrum (clint-fewbar)]

Looks great thanks Kapil!

review: Approve

=== modified file 'juju/lib/lxc/__init__.py'
--- juju/lib/lxc/__init__.py	2012-04-12 18:39:20 +0000
+++ juju/lib/lxc/__init__.py	2012-05-29 15:26:21 +0000
@@ -246,6 +246,7 @@
             print >>fp, escape("JUJU_CONTAINER_NAME", self.container_name)
             print >>fp, escape("JUJU_PUBLIC_KEY", self.public_key)
             print >>fp, escape("JUJU_ORIGIN", self.origin)
+            print >>fp, escape("JUJU_SERIES", self.series)
             if self.source:
                 print >>fp, escape("JUJU_SOURCE", self.source)
 
 
=== modified file 'juju/lib/lxc/data/juju-create'
--- juju/lib/lxc/data/juju-create	2012-05-10 16:20:36 +0000
+++ juju/lib/lxc/data/juju-create	2012-05-29 15:26:21 +0000
@@ -99,11 +99,17 @@
     apt-get install $APT_OPTIONS bzr tmux sudo python-software-properties python-yaml
 
     if [ $JUJU_ORIGIN = "ppa" ]; then
-        # the echo forces an enter to get around the interactive
+        # The echo forces an enter to get around the interactive
         # prompt in apt-add-repository
         echo y | apt-add-repository ppa:juju/pkgs
         apt-get update
         apt-get install $APT_OPTIONS juju python-txzookeeper
+    elif [ $JUJU_ORIGIN = "proposed"]; then
+	# Enabled testing of proposed updates
+	echo "deb http://archive.ubuntu.com/ubuntu/ $JUJU_SERIES-proposed main universe" >> /etc/apt/sources.list
+        apt-get update
+        apt-get install $APT_OPTIONS juju python-txzookeeper
+
     elif [[ $JUJU_ORIGIN = lp:* ]]; then
         apt-get install $APT_OPTIONS python-txzookeeper python-setuptools
         mkdir /usr/lib/juju
 
=== modified file 'juju/providers/common/cloudinit.py'
--- juju/providers/common/cloudinit.py	2012-03-29 01:37:57 +0000
+++ juju/providers/common/cloudinit.py	2012-05-29 15:26:21 +0000
@@ -11,6 +11,7 @@
 DISTRO = "distro"
 PPA = "ppa"
 BRANCH = "branch"
+PROPOSED = "proposed"
 
 
 def _branch_install_scripts(branch):
@@ -23,8 +24,9 @@
 
 def _install_scripts(origin, origin_url):
     scripts = []
-    if origin not in (DISTRO, PPA):
+    if origin == BRANCH:
         scripts.extend(_branch_install_scripts(origin_url))
+
     scripts.extend([
         "sudo mkdir -p /var/lib/juju",
         "sudo mkdir -p /var/log/juju"])
@@ -69,7 +71,7 @@
     for line in data.splitlines():
         stripped = line.lstrip()
         if stripped:
-            yield (len(line)-len(stripped), stripped)
+            yield (len(line) - len(stripped), stripped)
 
 
 def parse_juju_origin(data):
@@ -109,7 +111,7 @@
                 return PPA, None
             indent, line = next()
             if indent != first_indent:
-                break # Going into a different version
+                break  # Going into a different version
     except StopIteration:
         pass
     return DISTRO, None
@@ -163,7 +165,8 @@
         self._zookeeper = True
         self._provision = True
 
-    def set_juju_source(self, branch=None, ppa=False, distro=False):
+    def set_juju_source(
+        self, branch=None, ppa=False, distro=False, proposed=False):
         """Set the version of juju the machine should run.
 
         :param branch: location from which to check out juju; for example,
@@ -176,13 +179,16 @@
         :param bool distro: if True, get the default juju version from the
             OS distribution.
 
+        :param bool proposed: if True, get the proposed juju version
+            from the OS distribution.
+
         :raises: :exc:`juju.errors.CloudInitError` if more than one option,
             or fewer than one options, are specified.
 
         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))) != 1:
+        if len(filter(None, (branch, ppa, distro, proposed))) != 1:
             raise CloudInitError("Please specify one source")
         if branch:
             self._origin = BRANCH
@@ -193,6 +199,9 @@
         elif distro:
             self._origin = DISTRO
             self._origin_url = None
+        elif proposed:
+            self._origin = PROPOSED
+            self._origin_url = None
 
     def set_machine_id(self, id):
         """Specify the juju machine ID.
@@ -296,11 +305,13 @@
         if self._zookeeper:
             packages.extend([
                 "default-jre-headless", "zookeeper", "zookeeperd"])
-        if self._origin in (DISTRO, PPA):
+        if self._origin in (DISTRO, PPA, PROPOSED):
             packages.append("juju")
         return packages
 
     def _collect_repositories(self):
+        if self._origin == PROPOSED:
+            return ["deb $MIRROR $RELEASE-proposed main universe"]
         if self._origin != DISTRO:
             return ["ppa:juju/pkgs"]
         return []
 
=== modified file 'juju/providers/common/launch.py'
--- juju/providers/common/launch.py	2012-03-29 01:37:57 +0000
+++ juju/providers/common/launch.py	2012-05-29 15:26:21 +0000
@@ -101,6 +101,8 @@
                 cloud_init.set_juju_source(branch=origin)
             elif origin == "ppa":
                 cloud_init.set_juju_source(ppa=True)
+            elif origin == "proposed":
+                cloud_init.set_juju_source(proposed=True)
             else:
                 # Ignore other values, just use the distro for sanity
                 cloud_init.set_juju_source(distro=True)
 
=== added file 'juju/providers/common/tests/data/cloud_init_proposed'
--- juju/providers/common/tests/data/cloud_init_proposed	1970-01-01 00:00:00 +0000
+++ juju/providers/common/tests/data/cloud_init_proposed	2012-05-29 15:26:21 +0000
@@ -0,0 +1,37 @@
+#cloud-config
+apt-update: true
+apt-upgrade: true
+apt_sources:
+- {source: 'deb $MIRROR $RELEASE-proposed main universe'}
+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]
+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]
 
=== modified file 'juju/providers/common/tests/test_cloudinit.py'
--- juju/providers/common/tests/test_cloudinit.py	2012-03-29 01:37:57 +0000
+++ juju/providers/common/tests/test_cloudinit.py	2012-05-29 15:26:21 +0000
@@ -116,6 +116,11 @@
         cloud_init.set_juju_source(distro=True)
         self.assert_render(cloud_init, "cloud_init_distro")
 
+    def test_render_proposed_source(self):
+        cloud_init = self.construct_normal()
+        cloud_init.set_juju_source(proposed=True)
+        self.assert_render(cloud_init, "cloud_init_proposed")
+
     def test_render_branch_source(self):
         cloud_init = self.construct_normal()
         cloud_init.set_juju_source(branch="lp:blah/juju/blah-blah")