Comment 9 for bug 1507867

Let's file a separate bug for the (now confirmed) issue with ignore-machine-addresses: true inside containers. The problem is ignoring the addresses the machine agent sees on the instance is fine only because we have provider-reported addresses still (e.g. node details from maas). For containers, which the provider doesn't know about (obviously), addresses we see on the machine should never be ignored.

Peter, we have a possible solution and we can provide a tarball with patched binaries you could try, however we were having issues with both upgrading 1.20->1.24.8.1 and 1.22 -> 1.24.8.1 (version change due to --upload-tools) due to 'invalid series "wily"' error from the apiserver. Trying apt-get upgrade, dist-upgrade, on both the client machine and on the bootstrap node, as well as using --series with upgrade-juju --upload-tools didn't solve the problem, so we can't actually verify it yet, but since you don't seem to have that issue, the proposed patch might work for you.

Michael, can you push what you have in the WIP branch with the fix please?