Juju Charms Collection
quantum-gateway package

Merge lp://staging/~zhhuabj/charms/trusty/quantum-gateway/lp74646 into lp://staging/~openstack-charmers/charms/trusty/quantum-gateway/next

  1. Trusty Tahr (14.04)
  2. lp74646
  3. Merge into next
Proposed by Hua Zhang
Status: Superseded
Proposed branch: lp://staging/~zhhuabj/charms/trusty/quantum-gateway/lp74646
Merge into: lp://staging/~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 3860 lines (+1403/-561)
36 files modified
charm-helpers-hooks.yaml (+1/-0)
config.yaml (+6/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+16/-7)
hooks/charmhelpers/contrib/network/ip.py (+83/-51)
hooks/charmhelpers/contrib/network/ufw.py (+182/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1)
hooks/charmhelpers/contrib/openstack/context.py (+319/-226)
hooks/charmhelpers/contrib/openstack/ip.py (+41/-27)
hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4)
hooks/charmhelpers/contrib/openstack/templating.py (+5/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+146/-13)
hooks/charmhelpers/contrib/python/debug.py (+40/-0)
hooks/charmhelpers/contrib/python/packages.py (+77/-0)
hooks/charmhelpers/contrib/python/rpdb.py (+42/-0)
hooks/charmhelpers/contrib/python/version.py (+18/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+89/-102)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/fstab.py (+10/-8)
hooks/charmhelpers/core/hookenv.py (+27/-11)
hooks/charmhelpers/core/host.py (+73/-20)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/core/services/helpers.py (+9/-5)
hooks/charmhelpers/core/templating.py (+2/-1)
hooks/charmhelpers/fetch/__init__.py (+18/-12)
hooks/charmhelpers/fetch/archiveurl.py (+53/-16)
hooks/charmhelpers/fetch/bzrurl.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+51/-0)
hooks/quantum_contexts.py (+3/-1)
hooks/quantum_hooks.py (+5/-0)
hooks/quantum_utils.py (+1/-1)
templates/icehouse/neutron.conf (+1/-0)
unit_tests/test_quantum_contexts.py (+40/-39)
unit_tests/test_quantum_hooks.py (+5/-1)
To merge this branch: bzr merge lp://staging/~zhhuabj/charms/trusty/quantum-gateway/lp74646
Reviewer Review Type Date Requested Status
Xiang Hui Pending
Edward Hope-Morley Pending
Review via email: mp+243980@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-11-24.

Description of the change

This story (SF#74646) supports setting VM's MTU<=1500 by setting mtu of phy NICs and network_device_mtu.
1, setting mtu for phy NICs both in nova-compute charm and neutron-gateway charm
   juju set nova-compute phy-nic-mtu=1546
   juju set neutron-gateway phy-nic-mtu=1546
2, setting mtu for peer devices between ovs bridge br-phy and ovs bridge br-int by adding 'network-device-mtu' parameter into /etc/neutron/neutron.conf
   juju set neutron-api network-device-mtu=1546
   Limitation:
   a, don't support linux bridge because we don't add those three parameters (ovs_use_veth, use_veth_interconnection, veth_mtu)
   b, for gre and vxlan, this step is optional.
   c, after setting network-device-mtu=1546 for neutron-api charm, quantum-gateway and neutron-openvswitch will find network-device-mtu paramter by relation, so it only supports openvswitch plugin at this stage.
3, at this time, MTU inside VM can continue to be configured via DHCP by seeting instance-mtu configuration.
   juju set neutron-gateway instance-mtu=1500
   Limitation:
   a, only support set VM's MTU<=1500, if wanting to set VM's MTU>1500, also need to set MTU for tap devices associated that VM by this link (http://pastebin.ubuntu.com/9272762/ )
   b, doesn't support MTU per network

NOTE: maybe we can't test this feature in bastion

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #1048 quantum-gateway-next for zhhuabj mp242612
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/quantum_hooks 106 2 98% 199-201
  hooks/quantum_utils 214 11 95% 394, 581-590
  TOTAL 451 18 96%
  Ran 83 tests in 3.175s
  OK

Full unit test output: http://paste.ubuntu.com/9206999/
Build: http://10.98.191.181:8080/job/charm_unit_test/1048/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1214 quantum-gateway-next for zhhuabj mp242612
    LINT OK: passed

LINT Results (max last 5 lines):
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  I: config.yaml: option ext-port has no default value
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option instance-mtu has no default value
  I: config.yaml: option external-network-id has no default value

Full lint test output: http://paste.ubuntu.com/9207009/
Build: http://10.98.191.181:8080/job/charm_lint_check/1214/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #518 quantum-gateway-next for zhhuabj mp242612
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9207407/
Build: http://10.98.191.181:8080/job/charm_amulet_test/518/

Revision history for this message
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal

So from what I understand, when deploying on metal and/or lxc containers, we need to set mtu in two places. First we need to set mtu on the physical inteface and maas bridge br0 (if maas deployed) used by OVS. Second, we need to set mtu for each veth attached to br0 used by lxc containers into which units are deployed. Also, the mtu needs to be set persistently so that when a node is rebooted it does not return to the default 1500 value.

I don't think the charm is the place to do this since it may not be aware of all these interfaces and setting an lxc default for all containers seems a bit too intrusuive. A MaaS preseed that performs these actions seems a better fit. Thoughts?

review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1311 quantum-gateway-next for zhhuabj mp242612
    LINT OK: passed

LINT Results (max last 5 lines):
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  I: config.yaml: option ext-port has no default value
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option instance-mtu has no default value
  I: config.yaml: option external-network-id has no default value

Full lint test output: http://paste.ubuntu.com/9354712/
Build: http://10.98.191.181:8080/job/charm_lint_check/1311/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #1145 quantum-gateway-next for zhhuabj mp242612
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/quantum_hooks 107 2 98% 201-203
  hooks/quantum_utils 202 1 99% 388
  TOTAL 440 8 98%
  Ran 83 tests in 3.396s
  OK

Full unit test output: http://paste.ubuntu.com/9354713/
Build: http://10.98.191.181:8080/job/charm_unit_test/1145/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #577 quantum-gateway-next for zhhuabj mp242612
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9354797/
Build: http://10.98.191.181:8080/job/charm_amulet_test/577/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1313 quantum-gateway-next for zhhuabj mp242612
    LINT OK: passed

LINT Results (max last 5 lines):
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  I: config.yaml: option ext-port has no default value
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option instance-mtu has no default value
  I: config.yaml: option external-network-id has no default value

Full lint test output: http://paste.ubuntu.com/9354898/
Build: http://10.98.191.181:8080/job/charm_lint_check/1313/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #1147 quantum-gateway-next for zhhuabj mp242612
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/quantum_hooks 107 2 98% 201-203
  hooks/quantum_utils 202 1 99% 388
  TOTAL 440 8 98%
  Ran 83 tests in 3.532s
  OK

Full unit test output: http://paste.ubuntu.com/9354899/
Build: http://10.98.191.181:8080/job/charm_unit_test/1147/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #579 quantum-gateway-next for zhhuabj mp242612
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9354971/
Build: http://10.98.191.181:8080/job/charm_amulet_test/579/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_lint_check #95 quantum-gateway-next for zhhuabj mp243980
    LINT OK: passed

LINT Results (max last 5 lines):
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  I: config.yaml: option ext-port has no default value
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option instance-mtu has no default value
  I: config.yaml: option external-network-id has no default value

Full lint test output: pastebin not avail., cmd error
Build: http://10.98.191.181:8080/job/charm_lint_check/95/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_amulet_test #55 quantum-gateway-next for zhhuabj mp243980
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
  WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: pastebin not avail., cmd error
Build: http://10.98.191.181:8080/job/charm_amulet_test/55/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_unit_test #104 quantum-gateway-next for zhhuabj mp243980
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/quantum_utils 202 197 2% 31-571
  TOTAL 440 428 3%
  Ran 3 tests in 0.003s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

Full unit test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_unit_test/104/

lp://staging/~zhhuabj/charms/trusty/quantum-gateway/lp74646 updated
87. By Hua Zhang

sync charm-helpers to inclue contrib.python to fix unit test error

88. By Hua Zhang

fix KeyError: network-device-mtu

89. By Hua Zhang

fix hanging indent

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches