From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Thu, 11 Sep 2014 03:00:13 +0000 (+0900)
Subject: ofagent: Remove broken XenAPI support
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=60816b637d391aa5e5aef9b4b3a432b5ce552cc8;p=openstack-build%2Fneutron-build.git

ofagent: Remove broken XenAPI support

ofagent has code for agent-on-DomU support inherited from OVS agent.
However, it's incomplete and broken.  Because ofagent uses a direct
OpenFlow channel instead of ovs-ofctl command to program a switch,
the method to use the special rootwrap can not work.

Closes-Bug: #1368006
Change-Id: I0bb25a296d1f1e65c233ece6deaef6c095d78707
---

diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
index de1516933..8c4b98a3e 100644
--- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
+++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
@@ -158,13 +158,6 @@ class OFANeutronAgentRyuApp(app_manager.RyuApp):
             LOG.exception(_LE("Agent failed to create agent config map"))
             raise SystemExit(1)
 
-        is_xen_compute_host = ('rootwrap-xen-dom0' in
-                               agent_config['root_helper'])
-        if is_xen_compute_host:
-            # Force ip_lib to always use the root helper to ensure that ip
-            # commands target xen dom0 rather than domU.
-            cfg.CONF.set_default('ip_lib_force_root', True)
-
         agent = OFANeutronAgent(ryuapp, **agent_config)
         self.arplib.set_bridge(agent.int_br)