From 7546d736d6883ee705c2b4dd1b1463d81386b2e7 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 2 Jul 2014 15:53:05 -0400
Subject: ENI: enable 'auto' on bridges by default

---
 os_net_config/impl_eni.py            | 1 +
 os_net_config/tests/test_impl_eni.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'os_net_config')

diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py
index 9f43f88..f676a7e 100644
--- a/os_net_config/impl_eni.py
+++ b/os_net_config/impl_eni.py
@@ -72,6 +72,7 @@ class ENINetConfig(os_net_config.NetConfig):
         else:
             _iface += "manual\n"
         if isinstance(interface, objects.OvsBridge):
+            data += "auto %s\n" % interface.name
             data += "allow-ovs %s\n" % interface.name
             data += _iface
             data += address_data
diff --git a/os_net_config/tests/test_impl_eni.py b/os_net_config/tests/test_impl_eni.py
index 5a20093..a3656bf 100644
--- a/os_net_config/tests/test_impl_eni.py
+++ b/os_net_config/tests/test_impl_eni.py
@@ -44,7 +44,8 @@ _OVS_PORT_IFACE = _OVS_PORT_BASE + """iface eth0 inet manual
     ovs_type OVSPort
 """
 
-_OVS_BRIDGE_DHCP = """allow-ovs br0
+_OVS_BRIDGE_DHCP = """auto br0
+allow-ovs br0
 iface br0 inet dhcp
     ovs_type OVSBridge
     ovs_ports eth0
-- 
cgit 1.2.3-korg