diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-08-22 10:38:17 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-08-22 10:38:17 -0400 |
| commit | 941cbfec49a3ee2d2ff6aa3fa054fb2559886ca4 (patch) | |
| tree | 50b7273780a84fe7841bb78c08649d28782fb4e8 /os_net_config/impl_eni.py | |
| parent | 3b5e8789871e1722f8a5122236893730cf3d1751 (diff) | |
Add support for ovs_extra.
Adds support for ovs_extra to the OVS Bridge and
OVS bond objects.
Diffstat (limited to 'os_net_config/impl_eni.py')
| -rw-r--r-- | os_net_config/impl_eni.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index 944893e..3dea6c0 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -47,6 +47,7 @@ class ENINetConfig(os_net_config.NetConfig): def _add_common(self, interface, static_addr=None): + ovs_extra = [] data = "" address_data = "" if static_addr: @@ -94,9 +95,9 @@ class ENINetConfig(os_net_config.NetConfig): data += " pre-up ip addr flush dev %s\n" % mem.name if interface.primary_interface_name: mac = utils.interface_mac(interface.primary_interface_name) - data += (" ovs_extra set bridge %s " - "other-config:hwaddr=%s\n" - % (interface.name, mac)) + ovs_extra.append ("set bridge %s other-config:hwaddr=%s" % + (interface.name, mac)) + ovs_extra.extend(interface.ovs_extra) elif interface.ovs_port: if isinstance(interface, objects.Vlan): data += "auto vlan%i\n" % interface.vlan_id @@ -127,6 +128,10 @@ class ENINetConfig(os_net_config.NetConfig): data += address_data if interface.mtu != 1500: data += " mtu %i\n" % interface.mtu + + if ovs_extra: + data += " ovs_extra %s\n" % " -- ".join(ovs_extra) + return data def add_interface(self, interface): |