diff --git a/doc/source/admin/config-bgp-dynamic-routing.rst b/doc/source/admin/config-bgp-dynamic-routing.rst index bc5e67e421f..6c0e00a08bc 100644 --- a/doc/source/admin/config-bgp-dynamic-routing.rst +++ b/doc/source/admin/config-bgp-dynamic-routing.rst @@ -59,6 +59,11 @@ The example configuration involves the following components: * Router 3 contains IP addresses 203.0.113.13 and 198.51.100.1 +* One preexisting peering network 10.0.0.0/24 on the host running the + neutron BGP dynamic routing agent to facilitate BGP communication with its + peer. 10.0.0.1 is the address for the host and 10.0.0.2 the address for the + peer. + .. note:: The example configuration assumes sufficient knowledge about the @@ -102,7 +107,7 @@ Agent nodes bgp_router_id = ROUTER_ID Replace ``ROUTER_ID`` with a suitable unique 32-bit number, typically an - IPv4 address on the host running the agent. For example, 192.0.2.2. + IPv4 address on the host running the agent. For example, 10.0.0.1. Verify service operation ------------------------ @@ -643,7 +648,7 @@ networks and floating IP addresses for instances using those networks. .. code-block:: console - $ openstack bgp peer create --peer-ip 192.0.2.1 \ + $ openstack bgp peer create --peer-ip 10.0.0.2 \ --remote-as REMOTE_AS bgppeer Created a new bgp_peer: +-----------+--------------------------------------+ @@ -652,7 +657,7 @@ networks and floating IP addresses for instances using those networks. | auth_type | none | | id | 35c89ca0-ac5a-4298-a815-0b073c2362e9 | | name | bgppeer | - | peer_ip | 192.0.2.1 | + | peer_ip | 10.0.0.2 | | remote_as | 4321 | | tenant_id | b3ac05ef10bf441fbf4aa17f16ae1e6d | +-----------+--------------------------------------+ diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example1.graffle b/doc/source/admin/figures/bgp-dynamic-routing-example1.graffle index 6ef656b4520..602067487a9 100644 Binary files a/doc/source/admin/figures/bgp-dynamic-routing-example1.graffle and b/doc/source/admin/figures/bgp-dynamic-routing-example1.graffle differ diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example1.png b/doc/source/admin/figures/bgp-dynamic-routing-example1.png index a4bd88aa2fc..7a615a73cb4 100644 Binary files a/doc/source/admin/figures/bgp-dynamic-routing-example1.png and b/doc/source/admin/figures/bgp-dynamic-routing-example1.png differ diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example1.svg b/doc/source/admin/figures/bgp-dynamic-routing-example1.svg index 04c76457b15..a4ff3559265 100644 --- a/doc/source/admin/figures/bgp-dynamic-routing-example1.svg +++ b/doc/source/admin/figures/bgp-dynamic-routing-example1.svg @@ -1,3 +1,232 @@ - Produced by OmniGraffle 6.6 2016-08-10 22:15:39 +0000Canvas 1Layer 1BGP Dynamic RoutingExample with self-service networksSelf-service network 110.0.1.0/24External networksL3 AgentPeering network192.0.2.0/30BGP AgentExternalNetworksSelf-service network 210.0.2.0/24Provider RouterProviderNetworkSelf-serviceNetwork 1Self-serviceNetwork 2Self-serviceNetwork 3Router 1203.0.113.110.0.1.1Router 2203.0.113.210.0.2.1Router 3203.0.113.310.0.3.1Provider network203.0.113.0/24Self-service network 310.0.3.0/24Prefix Advertisements10.0.1.0/24 next-hop 203.0.113.110.0.2.0/24 next-hop 203.0.113.2Address scopePeering SessionAS 1234Peering SessionAS 4321 + + + + + + + + + + + + + + + Canvas 1 + + Layer 1 + + + BGP Dynamic Routing + Example with self-service networks + + + + + + + + Self-service network 1 + 192.0.2.0/25 + + + + + + + + External networks + + + + + + + L3 Agent + + + + + + + + Peering network + 10.0.0.0/24 + + + + + + + BGP Agent + + + + + + + + + + External + Networks + + + + + + + + Self-service network 2 + 192.0.2.128/25 + + + + + + + + + + + + + + + + + + + Provider Router + + + + + + + Provider + Network + + + + + + + + + + + + + + + + Self-service + Network 1 + + + + + + + Self-service + Network 2 + + + + + + + Self-service + Network 3 + + + + + + + Router 1 + 203.0.113.1 + 192.0.2.1 + + + + + + + Router 2 + 203.0.113.2 + 192.0.2.129 + + + + + + + Router 3 + 203.0.113.3 + 198.51.100.1 + + + + + + + + Provider network + 203.0.113.0/24 + + + + + + + + Self-service network 3 + 198.51.100.0/24 + + + + + + + + Prefix Advertisements + 192.0.2.0/25 next-hop 203.0.113.1 + 192.0.2.128/25 next-hop 203.0.113.2 + + + + + + + + Address scope + + + + + + + Peering Session + AS 1234 + 10.0.0.1 + + + + + + + Peering Session + AS 4321 + 10.0.0.2 + + + + + + + + diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example2.graffle b/doc/source/admin/figures/bgp-dynamic-routing-example2.graffle index 83d5d4b229f..06c1cc3b216 100644 Binary files a/doc/source/admin/figures/bgp-dynamic-routing-example2.graffle and b/doc/source/admin/figures/bgp-dynamic-routing-example2.graffle differ diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example2.png b/doc/source/admin/figures/bgp-dynamic-routing-example2.png index e4a266ee157..da54371f7eb 100644 Binary files a/doc/source/admin/figures/bgp-dynamic-routing-example2.png and b/doc/source/admin/figures/bgp-dynamic-routing-example2.png differ diff --git a/doc/source/admin/figures/bgp-dynamic-routing-example2.svg b/doc/source/admin/figures/bgp-dynamic-routing-example2.svg index 4ed8e6a1dc8..990c014557e 100644 --- a/doc/source/admin/figures/bgp-dynamic-routing-example2.svg +++ b/doc/source/admin/figures/bgp-dynamic-routing-example2.svg @@ -1,3 +1,267 @@ - Produced by OmniGraffle 6.6 2016-08-10 22:15:47 +0000Canvas 1Layer 1BGP Dynamic RoutingExample with floating IP addressesSelf-service network 110.0.1.0/24External networksL3 AgentPeering network192.0.2.0/30BGP AgentExternalNetworksSelf-service network 210.0.2.0/24Provider RouterProviderNetworkRouter 1203.0.113.110.0.1.1Router 2203.0.113.210.0.2.1Router 3203.0.113.310.0.3.1Provider network203.0.113.0/24Self-service network 310.0.3.0/24Prefix Advertisements10.0.1.0/24 next-hop 203.0.113.110.0.2.0/24 next-hop 203.0.113.2203.0.113.101/32 next-hop 203.0.113.1203.0.113.102/32 next-hop 203.0.113.2Self-serviceNetwork 1Self-serviceNetwork 2Self-serviceNetwork 3Instance 1203.0.113.101Instance 2203.0.113.102Instance 3203.0.113.103Address scopePeeringSessionAS 1234Peering SessionAS 4321 + + + + + + + + + + + + + + + Canvas 1 + + Layer 1 + + + BGP Dynamic Routing + Example with floating IP addresses + + + + + + + + Self-service network 1 + 192.0.2.0/25 + + + + + + + + External networks + + + + + + + L3 Agent + + + + + + + + Peering network + 10.0.0.0/24 + + + + + + + BGP Agent + + + + + + + + + + External + Networks + + + + + + + + Self-service network 2 + 192.0.2.128/25 + + + + + + + + + + + + + + + + + + + Provider Router + + + + + + + Provider + Network + + + + + + + + + + + + + + + + Router 1 + 203.0.113.1 + 192.0.2.1 + + + + + + + Router 2 + 203.0.113.2 + 192.0.2.129 + + + + + + + Router 3 + 203.0.113.3 + 198.51.100.1 + + + + + + + + Provider network + 203.0.113.0/24 + + + + + + + + Self-service network 3 + 198.51.100.0/24 + + + + + + + + Prefix Advertisements + 192.0.2.0/25 next-hop 203.0.113.1 + 192.0.2.128/25 next-hop 203.0.113.2 + 203.0.113.101/32 next-hop 203.0.113.1 + 203.0.113.102/32 next-hop 203.0.113.2 + + + + + + + + + + + + + + + + Self-service + Network 1 + + + + + + + Self-service + Network 2 + + + + + + + Self-service + Network 3 + + + + + + + Instance 1 + 203.0.113.101 + + + + + + + Instance 2 + 203.0.113.102 + + + + + + + Instance 3 + 203.0.113.103 + + + + + + + + Address scope + + + + + + + Peering Session + AS 1234 + 10.0.0.1 + + + + + + + Peering Session + AS 4321 + 10.0.0.2 + + + + + + + +