|
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.
https://code.launchpad.net/~thumper/juju-core/maas-lxc/+merge/193405
(do not edit description out of merge proposal)
Total comments: 4
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+143 lines, -107 lines) |
Patch |
 |
A |
[revision details]
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
container/lxc/lxc.go
|
View
|
|
6 chunks |
+12 lines, -47 lines |
0 comments
|
Download
|
 |
M |
container/lxc/lxc_test.go
|
View
|
|
2 chunks |
+6 lines, -8 lines |
0 comments
|
Download
|
 |
M |
environs/cloudinit.go
|
View
|
|
2 chunks |
+20 lines, -12 lines |
0 comments
|
Download
|
 |
M |
provider/local/environ.go
|
View
|
|
1 chunk |
+7 lines, -9 lines |
0 comments
|
Download
|
 |
M |
state/api/params/params.go
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
state/api/provisioner/provisioner.go
|
View
|
|
1 chunk |
+14 lines, -0 lines |
1 comment
|
Download
|
 |
M |
state/api/provisioner/provisioner_test.go
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
state/apiserver/provisioner/provisioner.go
|
View
|
|
1 chunk |
+13 lines, -0 lines |
2 comments
|
Download
|
 |
M |
state/apiserver/provisioner/provisioner_test.go
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
worker/provisioner/lxc-broker.go
|
View
|
|
4 chunks |
+21 lines, -7 lines |
1 comment
|
Download
|
 |
M |
worker/provisioner/lxc-broker_test.go
|
View
|
|
3 chunks |
+7 lines, -2 lines |
0 comments
|
Download
|
 |
M |
worker/provisioner/provisioner.go
|
View
|
|
3 chunks |
+17 lines, -22 lines |
0 comments
|
Download
|
Total messages: 4
|