Fixed lp:1442257 - port of #2366 to 1.25 #2392

Merged
merged 1 commit into from May 21, 2015

Conversation

Projects
None yet
3 participants
Contributor

dimitern commented May 21, 2015

This includes 2 fixes for 1.25:

  • http://pad.lv/1442257 - instead of inheriting LXC containers' host's
    primary NIC's MTU value for container NICs, now we have an optional
    integer environment setting "lxc-default-mtu", which when set to a
    positive number will cause all LXC (but not KVM) NICs to use that
    MTU. This is a straightforward port of #2365 to 1.25.
  • Related, but not a fix for http://pad.lv/1443942 (originally proposed
    as #2190 but it didn't land in time) - only add iptables SNAT rules
    on the container hosts for EC2 environments, as this breaks MAAS and
    it's not needed (fallout from the original fix #2071 for bug
    http://pad.lv/1442801).

Live tested on MAAS and EC2 with the following configurations:

  • bootstrap on trusty, add a precise node
  • bootstrap on precise, add a trusty node
  • in both cases above, do a test with and without the address-allocation
    feature flag
  • deploy workloads and relate them in LXC and KVM

More unit tests around the enableNAT logic will be added later,
as described bug lp:1443942.

+ container.ConfigName: "juju",
+ container.ConfigLXCDefaultMTU: "9000",
+
+ "use-aufs": "false",
@themue

themue May 21, 2015

Contributor

Sadly no constant when this setting has been introduced.

@dimitern

dimitern May 21, 2015

Contributor

Yeah :/

Contributor

themue commented May 21, 2015

LGTM 👍

Contributor

dimitern commented May 21, 2015

$$fixes-1442257$$

Contributor

jujubot commented May 21, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented May 21, 2015

Build failed: Does not match ['fixes-1457031']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/3347

Contributor

dimitern commented May 21, 2015

the blocker is Fix Committed, so $$JFDI$$

Contributor

jujubot commented May 21, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented May 21, 2015

Build failed: Does not match ['fixes-1457031']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/3348

Contributor

dimitern commented May 21, 2015

$$JFDI$$

Contributor

jujubot commented May 21, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request May 21, 2015

Merge pull request #2392 from dimitern/lp-1442257-1.25
Fixed lp:1442257 - port of #2366 to 1.25

This includes 2 fixes for 1.25:

* http://pad.lv/1442257 - instead of inheriting LXC containers' host's
  primary NIC's MTU value for container NICs, now we have an optional
  integer environment setting "lxc-default-mtu", which when set to a
  positive number will cause all LXC (but not KVM) NICs to use that
  MTU. This is a straightforward port of #2365 to 1.25.
* Related, but not a fix for http://pad.lv/1443942 (originally proposed
  as #2190 but it didn't land in time) - only add iptables SNAT rules
  on the container hosts for EC2 environments, as this breaks MAAS and
  it's not needed (fallout from the original fix #2071 for bug
  http://pad.lv/1442801).

Live tested on MAAS and EC2 with the following configurations:
* bootstrap on trusty, add a precise node
* bootstrap on precise, add a trusty node
* in both cases above, do a test with and without the address-allocation
  feature flag
* deploy workloads and relate them in LXC and KVM

More unit tests around the enableNAT logic will be added later,
as described bug lp:1443942.

@jujubot jujubot merged commit fd6d4ed into juju:master May 21, 2015

@dimitern dimitern deleted the dimitern:lp-1442257-1.25 branch May 21, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment