summaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-05-17 08:50:55 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-05-17 08:52:28 +0900
commit8fd25af4ce9ab902e24eb06644ef2e9c42cee7e0 (patch)
treefca38cf5df338ca0abae36c4579fb551fef2a66d /docs
parent949c58fbf6d5ccb79ee87a5105968d3fe591a3a9 (diff)
zebra: make zebra config consistent with the rests
- split config and state - move to Bgp structure (aligned with Rpki, Bmp, and Mrt) Also makes zebra configured via GRPC channel. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'docs')
-rw-r--r--docs/sources/configuration.md10
-rw-r--r--docs/sources/zebra.md9
2 files changed, 11 insertions, 8 deletions
diff --git a/docs/sources/configuration.md b/docs/sources/configuration.md
index 44830c58..ef2025c0 100644
--- a/docs/sources/configuration.md
+++ b/docs/sources/configuration.md
@@ -17,10 +17,6 @@
default-import-policy = "reject-route"
export-policy-list = ["policy2"]
default-export-policy = "accept-route"
- [global.zebra]
- enabled = true
- url = "unix:/var/run/quagga/zserv.api"
- redistribute-route-type-list = ["connect"]
[global.mpls-label-range]
min-label = 1000
max-label = 2000
@@ -40,6 +36,12 @@
file-name = "/tmp/log/2006/01/02.1504.dump"
interval = 180
+[zebra]
+ [zebra.config]
+ enabled = true
+ url = "unix:/var/run/quagga/zserv.api"
+ redistribute-route-type-list = ["connect"]
+
[[neighbors]]
[neighbors.config]
peer-as = 2
diff --git a/docs/sources/zebra.md b/docs/sources/zebra.md
index 9b1233e1..b5b431d1 100644
--- a/docs/sources/zebra.md
+++ b/docs/sources/zebra.md
@@ -17,10 +17,11 @@ Assume you finished [Getting Started](https://github.com/osrg/gobgp/blob/master/
You need to enable the zebra feature in the Global configuration as follows.
```toml
-[globa.zebra]
- enabled = true
- url = "unix:/var/run/quagga/zserv.api"
- redistribute-route-type-list = ["connect"]
+[zebra]
+ [zebra.config]
+ enabled = true
+ url = "unix:/var/run/quagga/zserv.api"
+ redistribute-route-type-list = ["connect"]
```
You can skip Url. If it's skipped, GoBGP uses "unix:/var/run/quagga/zserv.api" as the Url.