neutron-openvswitch-agent expects tunnel_types in [agent] section

[Thomas Stinner]

In the documentation the tunnel_type is set in the ovs - section, but the neutron-openvswitch-agent expects the tunnel_type in an [agent] section.

Since GRE is the default value when no tunnel_type is found it works nevertheless. However, if you take the documentation and change everything to vxlan it does not work.

See around line 1491 of ovs_neutron_agent.py:

 kwargs = dict(
   1492 integ_br=config.OVS.integration_bridge,
   1493 tun_br=config.OVS.tunnel_bridge,
   1494 local_ip=config.OVS.local_ip,
   1495 bridge_mappings=bridge_mappings,
   1496 root_helper=config.AGENT.root_helper,
   1497 polling_interval=config.AGENT.polling_interval,
   1498 minimize_polling=config.AGENT.minimize_polling,
   1499 tunnel_types=config.AGENT.tunnel_types,
   1500 veth_mtu=config.AGENT.veth_mtu,
   1501 enable_distributed_routing=config.AGENT.enable_distributed_routing,
   1502 l2_population=config.AGENT.l2_population,
   1503 arp_responder=config.AGENT.arp_responder,
   1504 use_veth_interconnection=config.OVS.use_veth_interconnection,
   1505 )

-----------------------------------
Built: 2014-11-08T10:24:23 00:00
git SHA: 4cac64d8260b9e49f3f9a1c462a8bd34df24bd5f
URL: http://docs.openstack.org/juno/install-guide/install/zypper/content/neutron-network-node.html
source File: file:/home/jenkins/workspace/openstack-manuals-tox-doc-publishdocs/doc/install-guide/section_neutron-network-node.xml
xml:id: neutron-network-node

[Matt Kassawara (ionosphere80)]

Good catch. Contrary to the deprecation message for the [ovs] 'tunnel_type' option in Icehouse, the replacement options in [agent] didn't actually work until Juno. Although the neutron code looks good now, I still want to test the [agent] 'tunnel_types' option with GRE before patching the installation guide.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/136116
Committed: https://git.openstack.org/cgit/openstack/openstack-manuals/commit/?id=300aaf719d6088096d0914df4375384f930a9605
Submitter: Jenkins
Branch: master

commit 300aaf719d6088096d0914df4375384f930a9605
Author: Matthew Kassawara <email address hidden>
Date: Thu Nov 20 14:18:46 2014 -0600

    Update neutron ML2 configuration

    I updated the installation guide neutron ML2 configuration to
    use the newer '[agent] tunnel_types' option instead of the
    '[ovs] tunnel_type' option. I also improved the description of
    a few steps.

    Change-Id: I9ddc150b7f09b15afaf1b9a4113a0fb8b13fe032
    Closes-Bug: #1391097
    backport: juno

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/136336

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/136336
Committed: https://git.openstack.org/cgit/openstack/openstack-manuals/commit/?id=bbaeea3d6226ef7b664897d4af2a8ce2352257d1
Submitter: Jenkins
Branch: stable/juno

commit bbaeea3d6226ef7b664897d4af2a8ce2352257d1
Author: Matthew Kassawara <email address hidden>
Date: Thu Nov 20 14:18:46 2014 -0600

    Update neutron ML2 configuration

    I updated the installation guide neutron ML2 configuration to
    use the newer '[agent] tunnel_types' option instead of the
    '[ovs] tunnel_type' option. I also improved the description of
    a few steps.

    Change-Id: I9ddc150b7f09b15afaf1b9a4113a0fb8b13fe032
    Closes-Bug: #1391097
    backport: juno
    (cherry picked from commit 300aaf719d6088096d0914df4375384f930a9605)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/openstack-manuals 15.0.0 release.