fix openvswitch requirement check

With VXLAN enabled on openvswitch, neutron checks
module version of the openvswitch kernel module.
If the pattern to extract the version matches twice
(eg. for path and version) the agent dies.

This patch ensures, that only the version is checked
against the pattern.

Change-Id: I879624f6b0936cab59e02958ae3a89950df773bb
Closes-Bug: #1322139

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 97e9af2cb5f6d279d8c2b7b5c2869d1e688e3ea9..8bb14c7201e352f94f1bc6e4b7902804de9e2e5b 100644 (file)
--- 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", "openvswitch"]
+    args = ["modinfo", "-F vermagic", "openvswitch"]
     try:
         cmd = utils.execute(args)
         for line in cmd.split('\n'):