From e2b5880e7b258aa6bb5ce7b310c843c1dfab893f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 23 Apr 2019 02:14:15 -0400 Subject: [PATCH 1/2] doc: Cleanup output of new PIM-EVPN doc The PIM-EVPN doc was not rendering very well on the website. So Update documentation to allow it to render better. Signed-off-by: Donald Sharp --- doc/user/pim.rst | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/user/pim.rst b/doc/user/pim.rst index e385df3b6d..8686d063e9 100644 --- a/doc/user/pim.rst +++ b/doc/user/pim.rst @@ -509,14 +509,22 @@ PIM EVPN configuration To use PIM in the underlay for overlay BUM forwarding associate a multicast group with the L2 VNI. The actual configuration is based on your distribution. Here is an ifupdown2 example - -auto vx-10100 -iface vx-10100 + +.. code-block:: interface + + auto vx-10100 + iface vx-10100 vxlan-id 10100 bridge-access 100 vxlan-local-tunnelip 27.0.0.11 - vxlan-mcastgrp 239.1.1.100 >>>>>>>> -PIM will see the vxlan configuration and auto configure state to properly -forward BUM traffic. + vxlan-mcastgrp 239.1.1.100 + + +.. note:: + + PIM will see the ``vxlan-mcastgrp`` configuration and auto configure + state to properly forward BUM traffic. + PIM also needs to be configured in the underlay to allow the BUM MDT to be setup. This is existing PIM configuration - From e7a664c19890cb18db2aef255b9a657044612695 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 23 Apr 2019 19:04:45 +0000 Subject: [PATCH 2/2] doc: pim evpn tabs -> spaces And remove `interface` highlight directive Signed-off-by: Quentin Young --- doc/user/pim.rst | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/doc/user/pim.rst b/doc/user/pim.rst index 8686d063e9..5148d3baff 100644 --- a/doc/user/pim.rst +++ b/doc/user/pim.rst @@ -506,28 +506,25 @@ Clear commands reset various variables. PIM EVPN configuration ====================== -To use PIM in the underlay for overlay BUM forwarding associate a -multicast group with the L2 VNI. The actual configuration is based -on your distribution. Here is an ifupdown2 example - - -.. code-block:: interface +To use PIM in the underlay for overlay BUM forwarding associate a multicast +group with the L2 VNI. The actual configuration is based on your distribution. +Here is an ifupdown2 example:: auto vx-10100 iface vx-10100 - vxlan-id 10100 - bridge-access 100 - vxlan-local-tunnelip 27.0.0.11 - vxlan-mcastgrp 239.1.1.100 - + vxlan-id 10100 + bridge-access 100 + vxlan-local-tunnelip 27.0.0.11 + vxlan-mcastgrp 239.1.1.100 .. note:: - PIM will see the ``vxlan-mcastgrp`` configuration and auto configure - state to properly forward BUM traffic. + PIM will see the ``vxlan-mcastgrp`` configuration and auto configure state + to properly forward BUM traffic. +PIM also needs to be configured in the underlay to allow the BUM MDT to be +setup. This is existing PIM configuration: -PIM also needs to be configured in the underlay to allow the BUM MDT to -be setup. This is existing PIM configuration - - Enable pim on the underlay L3 interface via the "ip pim" command. - Configure RPs for the BUM multicast group range. - Ensure the PIM is enabled on the lo of the VTEPs and the RP.