Merge lp:~thumper/juju-core/local-provider-machines-no-lxc into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Fix local provider again.

The cloud-init data for local provider machines was
trying to install lxc. This has been avoided as a
container due to the problem with nested lxc and the
default profiles in precise.

The fact that lxc was being installed on these machines
was an oversight, and one that is now biting us due to
a change to cgroups-lite which is triggering apparmor
to complain. This leaves apt in a partial install state
so while the agent itself will start, all install hooks
fail.

The solution is to specify in the machine config that
the container type is LXC. This stops LXC from being
added to the package list to install.

https://codereview.appspot.com/21740043/

Fix local provider again.

The cloud-init data for local provider machines was
trying to install lxc. This has been avoided as a
container due to the problem with nested lxc and the
default profiles in precise.

The fact that lxc was being installed on these machines
was an oversight, and one that is now biting us due to
a change to cgroups-lite which is triggering apparmor
to complain. This leaves apt in a partial install state
so while the agent itself will start, all install hooks
fail.

The solution is to specify in the machine config that
the container type is LXC. This stops LXC from being
added to the package list to install.

https://codereview.appspot.com/21740043/

[Tim Penhey (thumper)]

Reviewers: mp+193848_code.launchpad.net,

Message:
Please take a look.

Description:
Fix local provider again.

The cloud-init data for local provider machines was
trying to install lxc. This has been avoided as a
container due to the problem with nested lxc and the
default profiles in precise.

The fact that lxc was being installed on these machines
was an oversight, and one that is now biting us due to
a change to cgroups-lite which is triggering apparmor
to complain. This leaves apt in a partial install state
so while the agent itself will start, all install hooks
fail.

The solution is to specify in the machine config that
the container type is LXC. This stops LXC from being
added to the package list to install.

https://code.launchpad.net/~thumper/juju-core/local-provider-machines-no-lxc/+merge/193848

(do not edit description out of merge proposal)

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

Affected files (+3, -0 lines):
   A [revision details]
   M provider/local/environ.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131104055758-320vn2wsihe9ky8z
+New revision: <email address hidden>

Index: provider/local/environ.go
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go 2013-10-31 21:27:57 +0000
+++ provider/local/environ.go 2013-11-04 21:09:23 +0000
@@ -264,6 +264,7 @@
   series := possibleTools.OneSeries()
   logger.Debugf("StartInstance: %q, %s", machineConfig.MachineId, series)
   machineConfig.Tools = possibleTools[0]
+ machineConfig.MachineContainerType = instance.LXC
   logger.Debugf("tools: %#v", machineConfig.Tools)
   network := lxc.BridgeNetworkConfig(env.config.networkBridge())
   if err := environs.FinishMachineConfig(machineConfig, env.config.Config,
cons); err != nil {

[Nate Finch (natefinch)]

LGTM

https://codereview.appspot.com/21740043/

=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2013-10-31 21:27:57 +0000
+++ provider/local/environ.go	2013-11-04 21:17:25 +0000
@@ -264,6 +264,7 @@
 	series := possibleTools.OneSeries()
 	logger.Debugf("StartInstance: %q, %s", machineConfig.MachineId, series)
 	machineConfig.Tools = possibleTools[0]
+	machineConfig.MachineContainerType = instance.LXC
 	logger.Debugf("tools: %#v", machineConfig.Tools)
 	network := lxc.BridgeNetworkConfig(env.config.networkBridge())
 	if err := environs.FinishMachineConfig(machineConfig, env.config.Config, cons); err != nil {