Merge lp:~hopem/charms/trusty/neutron-gateway/lp1485655 into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Edward Hope-Morley]

[Edward Hope-Morley (hopem)]

this is simply a sync of charm-helpers to get https://code.launchpad.net/~hopem/charm-helpers/allow-list-nics-return-all/+merge/268264

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

charm_lint_check #8249 neutron-gateway-next for hopem mp268265
    LINT OK: passed

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

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

charm_unit_test #7648 neutron-gateway-next for hopem mp268265
    UNIT OK: passed

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

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

charm_amulet_test #5849 neutron-gateway-next for hopem mp268265
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5849/

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

charm_lint_check #8251 neutron-gateway-next for hopem mp268265
    LINT OK: passed

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

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

charm_unit_test #7650 neutron-gateway-next for hopem mp268265
    UNIT OK: passed

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

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

charm_amulet_test #5851 neutron-gateway-next for hopem mp268265
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5851/

[lp:~hopem/charms/trusty/neutron-gateway/lp1485655]

133. By Edward Hope-Morley on 2015-08-18

[hopem,r=]

Ensure all nics are included when resolving mac addresses
and filter out virtual interfaces.

Closes-Bug: 1485655

134. By Edward Hope-Morley on 2015-08-18

sync

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

charm_lint_check #8284 neutron-gateway-next for hopem mp268265
    LINT OK: passed

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

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

charm_unit_test #7682 neutron-gateway-next for hopem mp268265
    UNIT OK: passed

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

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

charm_amulet_test #5875 neutron-gateway-next for hopem mp268265
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5875/

[lp:~hopem/charms/trusty/neutron-gateway/lp1485655]

135. By Edward Hope-Morley on 2015-08-20

sync /next

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-08-03 14:52:53 +0000
+++ charm-helpers-hooks.yaml	2015-08-20 09:17:21 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~hopem/charm-helpers/allow-list-nics-return-all  
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'config.yaml'
--- config.yaml	2015-07-10 14:18:52 +0000
+++ config.yaml	2015-08-20 09:17:21 +0000
@@ -79,6 +79,12 @@
       their corresponding bridge. The bridges will allow usage of flat or
       VLAN network types with Neutron and should match this defined in
       bridge-mappings.
+      .
+      Ports provided can be the name or MAC address of the interface to be
+      added to the bridge. If MAC addresses are used, you may provide multiple
+      bridge:mac for the same bridge so as to be able to configure multiple
+      units. In this case the charm will run through the provided MAC addresses
+      for each bridge until it finds one it can resolve to an interface name.
   run-internal-router:
     type: string
     default: all