Merge lp:~ivoks/charms/trusty/neutron-gateway/mtu-vlan into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Ante Karamatić]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10303 neutron-gateway-next for ivoks mp271732
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10303/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9455 neutron-gateway-next for ivoks mp271732
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9455/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6497 neutron-gateway-next for ivoks mp271732
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12465535/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6497/

[Edward Hope-Morley (hopem)]

Sorry I should have spotted this before but this change needs to be applied to lp:charm-helpers first (i.e. charmhelpers.contrib.openstack.context) then synced into the charms.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

Done it for you...

https://code.launchpad.net/~hopem/charms/trusty/neutron-gateway/lp1497517/+merge/271887

[James Page (james-page)]

Merged under separate cover.

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-09-03 09:43:15 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-09-19 08:49:20 +0000
@@ -20,6 +20,7 @@
 import time
 from base64 import b64decode
 from subprocess import check_call
+from glob import glob
 
 import six
 import yaml
@@ -1334,8 +1335,13 @@
             ports = mappings.values()
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
+            all_ports = []
+            for port in ports:
+                for lport in glob("/sys/class/net/%s/lower_*" % port):
+                    all_ports.append(lport.split('_')[1])
+            all_ports.extend(ports)
             if mtu:
-                ctxt["devs"] = '\\n'.join(ports)
+                ctxt["devs"] = '\\n'.join(all_ports)
                 ctxt['mtu'] = mtu
 
         return ctxt