Created by William Reade on 2013-11-13 and last modified on 2013-11-13
Get this branch:
bzr branch lp:~fwereade/juju-core/fix-1233457-for-1.16
Only William Reade can upload to this branch. If you are William Reade please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

William Reade

Recent revisions

1983. By William Reade on 2013-11-13

cherrypick r2042 from lp:juju-core to fix lp:1233457

1982. By Tim Penhey on 2013-11-04

[r=thumper],[bug=1247299] Fix the lxc provider again.

Backporting fix from trunk to 1.16.

Also incrementing version numbers.


1981. By Curtis Hovey on 2013-10-31

[r=sinzui] Increment stable to 1.16.2

1980. By Tim Penhey on 2013-10-31

[r=thumper],[bug=1246556] Fix LXC containers on MAAS

We can't get a real CI framework soon enough.

When the provisioner was updated to use the API, this
accidentally broke LXC on MAAS, as the secret attributes
are stripped from the environment config for non-manager
nodes. This makes a completely invalid MAAS config, which
means the LCX provisioner task never starts.

There was no easy fix for this, so the correct one had
to do. That is to provide an API call to get what the
containers actually need, and not have them depend on
things they don't need.

I took this opportunity to also simplify the parameters
for the StartContainer call.


1979. By Ian Booth on 2013-10-31

[r=wallyworld],[bug=1246320] Use gwacl rev 229 to fix Azure api change

1978. By Martin Packman on 2013-10-30

[r=gz],[bug=1243861] cloudinit: Use cloud archive key not short key id

Cherrypick of r2002 from trunk.

Currently, when adding the cloud archive to apt_sources for
precise, we supply the short key id to obtain the signing
key. However, this requires access to the keyserver, which
not all deployments will have. By supplying the full text
of the public key instead, we can verify the download
without needing additional access.



1977. By Curtis Hovey on 2013-10-29

[r=sinzui],[bug=1241666] Backport the ubuntu series fix for trusty.

1976. By Curtis Hovey on 2013-10-29

[r=sinzui],[bug=1245004] Backport underscores in relation name fix.

1975. By Curtis Hovey on 2013-10-29

[r=sinzui] Increment 1.16 branch to 1.16.1 for bug fixes.

1974. By Roger Peppe on 2013-10-17

[r=rogpeppe] provider/maas: instance and storage uniqueness

This merges the following branches from trunk.
Fixes https://launchpad.net/bugs/1229275

revno: 1990 [merge]
author: Roger Peppe <email address hidden>
committer: Tarmac
branch nick: juju-core
timestamp: Wed 2013-10-16 13:12:52 +0000
  [r=rogpeppe] provider/maas: do not use environ-uuid

  As pointed out by fwereade, it could be
  confusing to have two things in the system
  that both purport to be a uuid for the environ.

  Also make the MAAS EnvironProvider.Validate
  check that we're not changing the maas-agent-name.


revno: 1989 [merge]
author: Julian Edwards <email address hidden>
committer: Tarmac
branch nick: juju-core
timestamp: Wed 2013-10-16 06:11:50 +0000
  [r=axwalk],[bug=1081247],[bug=1229275] Use the environment's UUID as a file prefix for all files in MAAS private storage to prevent different environments from overlapping.

revno: 1985 [merge]
author: Gavin Panella <email address hidden>
committer: Tarmac
branch nick: juju-core
timestamp: Wed 2013-10-16 01:56:42 +0000
  [r=wallyworld] Use environment-uuid when interacting with MAAS

  The environment-uuid is passed - as agent_name - to MAAS when acquiring
  and listing nodes. This will allow multiple Juju environments to coexist
  in a single MAAS user's account.

  In addition, it prevents environment-uuid from being set in
  environments.yaml, and returns an appropriate error message. This is
  intended to stop people from inadvertently clobbering existing

  It also starts cleaning up MAAS's providerSuite by dropping the environ
  attribute in favour of makeEnviron(). The former was initialised to a
  half-working environ that caused strange test failures.

revno: 1984 [merge]
author: Gavin Panella <email address hidden>
committer: Tarmac
branch nick: juju-core
timestamp: Tue 2013-10-15 17:03:22 +0000
  [r=gz] provider/maas: Add environment UUID

  We need a way to uniquely identify those machines in MAAS belonging to
  a Juju environment. Until now Juju's MAAS provider has assumed that
  all the machines that are allocated, are allocated to the environment
  that Juju is working with. This is obviously wrong, and can be

  This is the first part of work on the MAAS provider to use a unique
  identifier for an environment. MAAS will record this identifier
  (called 'agent_name' in MAAS) and allow its use for filtering.
  This branch merely adds the UUID to the environment's config.


  R=rogpeppe, rvb


Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.