From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 28 May 2014 19:24:46 +0000 (+0200)
Subject: Revert "fix openvswitch requirement check"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=276c7914421d821ce748a7a56e1a644b52597bc0;p=openstack-build%2Fneutron-build.git

Revert "fix openvswitch requirement check"

This reverts commit be340d1bab015c47650687f97393c6c9015fb537.

The fix did not fix anything.
See comments at
https://review.openstack.org/#/c/95592/

Change-Id: I2926acf4b0a7020a7ad3237e6d03d5b78bfcb6c4
---

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 8bb14c720..97e9af2cb 100644
--- a/neutron/agent/linux/ovs_lib.py
+++ b/neutron/agent/linux/ovs_lib.py
@@ -476,7 +476,7 @@ def get_installed_ovs_usr_version(root_helper):
 
 
 def get_installed_ovs_klm_version():
-    args = ["modinfo", "-F vermagic", "openvswitch"]
+    args = ["modinfo", "openvswitch"]
     try:
         cmd = utils.execute(args)
         for line in cmd.split('\n'):