Merge "Add enable_security_group option"

diff --cc etc/neutron/plugins/nec/nec.ini
Simple merge

diff --cc neutron/plugins/bigswitch/plugin.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/plugins/nec/nec_plugin.py
Simple merge

diff --cc neutron/plugins/ryu/ryu_neutron_plugin.py
Simple merge

diff --cc neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
index f5d289c6d46ac00ea5c1fed1c59fd23c45c2b0e2,0e21c9561968729c1b8136dacb1f6bf827b02e51..f4c5d41c7604beba4096071d3a246af0aec25ba7
--- 1/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
--- 2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
@@@ -96,10 -96,11 +96,13 @@@ class TestLinuxBridgeAgent(base.BaseTes
  
      def setUp(self):
          super(TestLinuxBridgeAgent, self).setUp()
 +        # disable setting up periodic state reporting
 +        cfg.CONF.set_override('report_interval', 0, 'AGENT')
          cfg.CONF.set_override('rpc_backend',
                                'neutron.openstack.common.rpc.impl_fake')
+         cfg.CONF.set_default('firewall_driver',
+                              'neutron.agent.firewall.NoopFirewallDriver',
+                              group='SECURITYGROUP')
          self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
          self.execute = self.execute_p.start()
          self.addCleanup(self.execute_p.stop)

diff --cc neutron/tests/unit/nec/test_portbindings.py
Simple merge

diff --cc neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge