Invalid version number '['3.13.0']' with Ubuntu trusty

[Simon Pasquier]

Running latest devstack on Trusty Ubuntu, the Neutron agent fails to start with the following backtrace:

2014-04-01 13:49:54.227 DEBUG neutron.agent.linux.utils [req-9f04e437-c667-40c2-8be4-aef96f4810de None None] Running command: ['uname', '-r'] from (pid=14900) create_process /opt/stack/neutron/neutron/agent/linux/utils.py:48
2014-04-01 13:49:54.232 DEBUG neutron.agent.linux.utils [req-9f04e437-c667-40c2-8be4-aef96f4810de None None]
Command: ['uname', '-r']
Exit code: 0
Stdout: '3.13.0-20-generic\n'
Stderr: '' from (pid=14900) execute /opt/stack/neutron/neutron/agent/linux/utils.py:74
2014-04-01 13:49:54.233 DEBUG neutron.agent.linux.utils [req-9f04e437-c667-40c2-8be4-aef96f4810de None None] Running command: ['sudo', '/usr/local/bin/neutron-rootwrap', '/etc/neutron/rootwrap.conf', 'ovs-vsctl', '--version'] from (pid=14900) create_process /opt/stack/neutron/neutron/agent/linux/utils.py:48
2014-04-01 13:49:54.348 DEBUG neutron.agent.linux.utils [req-9f04e437-c667-40c2-8be4-aef96f4810de None None]
Command: ['sudo', '/usr/local/bin/neutron-rootwrap', '/etc/neutron/rootwrap.conf', 'ovs-vsctl', '--version']
Exit code: 0
Stdout: 'ovs-vsctl (Open vSwitch) 2.0.1\nCompiled Feb 23 2014 14:42:32\n'
Stderr: '' from (pid=14900) execute /opt/stack/neutron/neutron/agent/linux/utils.py:74
2014-04-01 13:49:54.349 DEBUG neutron.agent.linux.ovs_lib [req-9f04e437-c667-40c2-8be4-aef96f4810de None None] Checking OVS version for VXLAN support installed klm version is None, installed Linux version is ['3.13.0'], installed user version is 2.0 from (pid=14900) check_ovs_vxlan_version /opt/stack/neutron/neutron/agent/linux/ovs_lib.py:541
2014-04-01 13:49:54.350 CRITICAL neutron [req-9f04e437-c667-40c2-8be4-aef96f4810de None None] invalid version number '['3.13.0']'
2014-04-01 13:49:54.350 TRACE neutron Traceback (most recent call last):
2014-04-01 13:49:54.350 TRACE neutron File "/usr/local/bin/neutron-openvswitch-agent", line 10, in <module>
2014-04-01 13:49:54.350 TRACE neutron sys.exit(main())
2014-04-01 13:49:54.350 TRACE neutron File "/opt/stack/neutron/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py", line 1360, in main
2014-04-01 13:49:54.350 TRACE neutron agent = OVSNeutronAgent(**agent_config)
2014-04-01 13:49:54.350 TRACE neutron File "/opt/stack/neutron/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py", line 214, in __init__
2014-04-01 13:49:54.350 TRACE neutron self._check_ovs_version()
2014-04-01 13:49:54.350 TRACE neutron File "/opt/stack/neutron/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py", line 232, in _check_ovs_version
2014-04-01 13:49:54.350 TRACE neutron ovs_lib.check_ovs_vxlan_version(self.root_helper)
2014-04-01 13:49:54.350 TRACE neutron File "/opt/stack/neutron/neutron/agent/linux/ovs_lib.py", line 550, in check_ovs_vxlan_version
2014-04-01 13:49:54.350 TRACE neutron 'kernel', 'VXLAN')
2014-04-01 13:49:54.350 TRACE neutron File "/opt/stack/neutron/neutron/agent/linux/ovs_lib.py", line 507, in _compare_installed_and_required_version
2014-04-01 13:49:54.350 TRACE neutron installed_kernel_version) >= dist_version.StrictVersion(
2014-04-01 13:49:54.350 TRACE neutron File "/usr/lib/python2.7/distutils/version.py", line 40, in __init__
2014-04-01 13:49:54.350 TRACE neutron self.parse(vstring)
2014-04-01 13:49:54.350 TRACE neutron File "/usr/lib/python2.7/distutils/version.py", line 107, in parse
2014-04-01 13:49:54.350 TRACE neutron raise ValueError, "invalid version number '%s'" % vstring
2014-04-01 13:49:54.350 TRACE neutron ValueError: invalid version number '['3.13.0']'
2014-04-01 13:49:54.350 TRACE neutron
q-agt failed to start

This is due to bug #1291535 and this fix: https://git.openstack.org/cgit/openstack/neutron/commit/?id=b2f65d9d447ddf2caf3b9c754bd00a5148bdf12c

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/84441

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/84441
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d4fdac7ae596888b8e83d9559019eafb728cd3fe
Submitter: Jenkins
Branch: master

commit d4fdac7ae596888b8e83d9559019eafb728cd3fe
Author: Simon Pasquier <email address hidden>
Date: Tue Apr 1 15:55:55 2014 +0200

    Fix function parsing the kernel version

    Change-Id: Id56efb476144a18cd9eb7279bc0f602760a86173
    Closes-Bug: #1300808

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/85515

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/85515
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=ea6b2b9cfaee9053639649935e9659e0bcff286c
Submitter: Jenkins
Branch: milestone-proposed

commit ea6b2b9cfaee9053639649935e9659e0bcff286c
Author: Simon Pasquier <email address hidden>
Date: Tue Apr 1 15:55:55 2014 +0200

    Fix function parsing the kernel version

    Change-Id: Id56efb476144a18cd9eb7279bc0f602760a86173
    Closes-Bug: #1300808
    (cherry picked from commit d4fdac7ae596888b8e83d9559019eafb728cd3fe)