Merge lp://staging/~zhhuabj/charms/trusty/nova-compute/lp74646 into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~zhhuabj/charms/trusty/nova-compute/lp74646 |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
3776 lines (+1430/-528) 35 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 (+90/-54) 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 (+339/-225) hooks/charmhelpers/contrib/openstack/ip.py (+41/-27) hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-2) 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 (+81/-21) hooks/charmhelpers/core/services/__init__.py (+2/-2) hooks/charmhelpers/core/services/helpers.py (+9/-5) hooks/charmhelpers/core/sysctl.py (+34/-0) 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/nova_compute_hooks.py (+6/-2) hooks/nova_compute_utils.py (+1/-1) unit_tests/test_nova_compute_hooks.py (+4/-1) |
To merge this branch: | bzr merge lp://staging/~zhhuabj/charms/trusty/nova-compute/lp74646 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edward Hope-Morley | Pending | ||
Xiang Hui | Pending | ||
Review via email:
|
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-
juju set neutron-api network-
Limitation:
a, don't support linux bridge because we don't add those three parameters (ovs_use_veth, use_veth_
b, for gre and vxlan, this step is optional.
c, after setting network-
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://
b, doesn't support MTU per network
NOTE: maybe we can't test this feature in bastion
UOSCI bot says:
charm_lint_check #1213 nova-compute-next for zhhuabj mp242611
LINT OK: passed
LINT Results (max last 5 lines): neutron- security- groups has no default value
I: config.yaml: option os-data-network has no default value
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-
I: config.yaml: option migration-auth-type has no default value
Full lint test output: http:// paste.ubuntu. com/9206996/ 10.98.191. 181:8080/ job/charm_ lint_check/ 1213/
Build: http://