openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Benedikt Trefzer 2014-05-26 22:45:25 +02:00
parent b53c094d83
commit be340d1bab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ovs_lib.py
View File

@ -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'):