From 3074ca61d775b1dda99588818fd3a970b9edd6f5 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Fri, 11 Sep 2020 09:06:15 +0100 Subject: [PATCH] Remove references to eth10/eth11 container interfaces Neturon agents run on the hosts for several releases now so this documentation is incorrect. Change-Id: I546824a2b2e21a6473656a66a7fd4daf14eb191d --- .../source/targethosts-networkconfig.rst | 16 +++---- doc/source/admin/troubleshooting.rst | 42 +++++-------------- .../openstack_user_config.yml.example | 10 ++--- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/deploy-guide/source/targethosts-networkconfig.rst b/deploy-guide/source/targethosts-networkconfig.rst index 5b9b28f0ba..fd2b02d404 100644 --- a/deploy-guide/source/targethosts-networkconfig.rst +++ b/deploy-guide/source/targethosts-networkconfig.rst @@ -74,13 +74,14 @@ Host network bridges information * OpenStack Networking tunnel: ``br-vxlan`` - The ``br-vxlan`` bridge is **required if** the environment is configured to + The ``br-vxlan`` interface is **required if** the environment is configured to allow projects to create virtual networks using VXLAN. - It provides the interface for virtual (VXLAN) tunnel networks. + It provides the interface for encapsulated virtual (VXLAN) tunnel network traffic. - The bridge attaches to a physical or logical interface, typically a - ``bond1`` VLAN subinterface. It also attaches to ``eth10`` in each - associated container. + Note that ``br-vxlan`` is not required to be a bridge at all, a physical interface + or a bond VLAN subinterface can be used directly and will be more efficient. The name + ``br-vxlan`` is maintained here for consistency in the documentation and example + configurations. The container network interface it attaches to is configurable in the ``openstack_user_config.yml`` file. @@ -91,9 +92,8 @@ Host network bridges information tagged or flat (no VLAN tag) networks. The bridge attaches to a physical or logical interface, typically ``bond1``. - It attaches to ``eth11`` for VLAN type networks in each associated - container. It is not assigned an IP address because it handles only + It is not assigned an IP address because it handles only layer 2 connectivity. The container network interface that the bridge attaches to is configurable - in the ``openstack_user_config.yml`` file. \ No newline at end of file + in the ``openstack_user_config.yml`` file. diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst index 081f51e1c7..9c87b4771c 100644 --- a/doc/source/admin/troubleshooting.rst +++ b/doc/source/admin/troubleshooting.rst @@ -143,27 +143,6 @@ IP address should be applied to ``br-vxlan``: valid_lft forever preferred_lft forever ... -IP address should be applied to eth10 inside the required LXC containers: - -.. code-block:: console - - # ip address show dev eth10 - 67: eth10: mtu 150...UP... - link/ether b1:b1:b1:b1:b1:02 brd ff:ff:ff:ff:ff:ff - inet 172.29.240.55/22 brd 172.29.243.255 scope global eth10 - valid_lft forever preferred_lft forever - ... - -``br-vxlan`` should contain veth-pair ends from required LXC containers and -a physical interface or tagged-subinterface: - -.. code-block:: console - - # brctl show br-vxlan - bridge name bridge id STP enabled interfaces - br-vxlan 8000.ghijkl123456 no bond1.100 - 3333333_eth10 - Checking services ~~~~~~~~~~~~~~~~~ @@ -287,15 +266,15 @@ LXC containers, VXLAN overlay and the Linuxbridge ml2 driver. NETWORK NODE - +-------------+ +-------------+ +-----------------+ - +->"If VXLAN"+->+ *bond#.#00 +--->+ *br vxlan +-->+*Container eth10 + - | +-------------+ +-------------+ +-----------------+ - +----------------+ | +-------------+ - |physical network|++ +--->+ | brq bridge |+--> Neutron DHCP/Router - +----------------+ | +-------------+ - | +-------------+ +-------------+ +-----------------+ - +->"If VLAN"+->+ bond1 +--->+ br vlan +-->+ Container eth11 + - +-------------+ +-------------+ +-----------------+ + +-------------+ +-------------+ + +->"If VXLAN"+->+ *bond#.#00 +--->+ *br vxlan +--> + | +-------------+ +-------------+ | + +----------------+ | +-------------+ + |physical network|++ +--->+| brq bridge |+--> Neutron DHCP/Router + +----------------+ | +-------------+ + | +-------------+ +-------------+ | + +->"If VLAN"+->+ bond1 +--->+ br vlan +--> + +-------------+ +-------------+ Preliminary troubleshooting questions to answer: ------------------------------------------------ @@ -402,8 +381,7 @@ Yes: Are VXLAN VTEP addresses able to ping each other? No: - - Check ``br-vxlan`` interface on Compute and ``eth10`` - inside the Neutron network agent container. + - Check ``br-vxlan`` interface on Compute and Network nodes - Check veth pairs between containers and linux bridges on the host. - Check that linux bridges contain the proper interfaces on compute and network nodes. diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index d7ed81d663..4bcff965b6 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -222,13 +222,11 @@ # nova compute and all storage service containers. Optionally applies to # to the swift proxy service. # - Network of type 'vxlan' that contains neutron VXLAN tenant networks -# 1 to 1000 and uses 'br-vxlan' bridge on target hosts. Maps to the -# 'eth10' device in containers. Applies to all neutron agent containers -# and neutron agents on bare metal hosts. +# 1 to 1000 and uses 'br-vxlan' bridge on target hosts. Applies to all +# neutron agents on bare metal hosts. # - Network of type 'vlan' that contains neutron VLAN networks 101 to 200 -# and 301 to 400 and uses the 'br-vlan' bridge on target hosts. Maps to -# the 'eth11' device in containers. Applies to all neutron agent -# containers and neutron agents on bare metal hosts. +# and 301 to 400 and uses the 'br-vlan' bridge on target hosts. Applies +# to all neutron agent containers and neutron agents on bare metal hosts. # - Network of type 'flat' that contains one neutron flat network and uses # the 'br-vlan' bridge on target hosts. Maps to the 'eth12' device in # containers. Applies to all neutron agent containers and neutron agents