@@ -664,6 +664,16 @@ function set_mtu {

 }

+# running_in_container - Returns true otherwise false

+function running_in_container {

+    if grep -q lxc /proc/1/cgroup; then

+        return 0

+    fi

+

+    return 1

+}

+

+

 # enable_kernel_bridge_firewall - Enable kernel support for bridge firewalling

 function enable_kernel_bridge_firewall {

     # Load bridge module. This module provides access to firewall for bridged

@@ -180,7 +180,9 @@ function configure_neutron_new {

             iniset $NEUTRON_CORE_PLUGIN_CONF ovs local_ip $HOST_IP

         fi

-        enable_kernel_bridge_firewall

+        if ! running_in_container; then

+            enable_kernel_bridge_firewall

+        fi

     fi

     # DHCP Agent

@@ -67,7 +67,9 @@ function neutron_plugin_configure_plugin_agent {

     fi

     if [[ "$Q_USE_SECGROUP" == "True" ]]; then

         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver

-        enable_kernel_bridge_firewall

+        if ! running_in_container; then

+            enable_kernel_bridge_firewall

+        fi

     else

         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver

     fi

@@ -80,7 +80,9 @@ function _neutron_ovs_base_install_agent_packages {

 function _neutron_ovs_base_configure_firewall_driver {

     if [[ "$Q_USE_SECGROUP" == "True" ]]; then

         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid

-        enable_kernel_bridge_firewall

+        if ! running_in_container; then

+            enable_kernel_bridge_firewall

+        fi

     else

         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver noop

     fi

@@ -889,7 +889,9 @@ function start_nova_rest {

     run_process n-crt "$NOVA_BIN_DIR/nova-cert --config-file $api_cell_conf"

     if is_service_enabled n-net; then

-        enable_kernel_bridge_firewall

+        if ! running_in_container; then

+            enable_kernel_bridge_firewall

+        fi

     fi

     run_process n-net "$NOVA_BIN_DIR/nova-network --config-file $compute_cell_conf"