From: Francis Dupont Date: Thu, 6 Jul 2017 11:11:00 +0000 (+0200) Subject: [master] Finishing merge of trac5121 (HRMode in flex/bison) X-Git-Tag: trac5227_base~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=512390eaa88bdd553fa13c6ed401e1d1aade54df;p=thirdparty%2Fkea.git [master] Finishing merge of trac5121 (HRMode in flex/bison) --- 512390eaa88bdd553fa13c6ed401e1d1aade54df diff --cc doc/examples/kea4/reservations.json index 6fb60898b7,495691dc9f..2c31cb5ed9 --- a/doc/examples/kea4/reservations.json +++ b/doc/examples/kea4/reservations.json @@@ -61,22 -59,29 +61,27 @@@ "pools": [ { "pool": "192.0.2.1 - 192.0.2.200" } ], "subnet": "192.0.2.0/24", "interface": "eth0", - "reservation-mode": "out-of-pool", - + // This directive tells Kea that reservations may be made both in-pool + // and out-of-pool. For improved performance, you may move all reservations + // out of the dynamic pool and change reservation-mode to "out-of-pool". + // Kea will then be able to skip querying for host reservations when + // assigning leases from dynamic pool. + "reservation-mode": "all", - "reservations": [ -# This is a reservation for a specific hardware/MAC address. It's a very -# simple reservation: just an address and nothing else. +// This is a reservation for a specific hardware/MAC address. It's a very +// simple reservation: just an address and nothing else. { "hw-address": "1a:1b:1c:1d:1e:1f", - "ip-address": "192.0.2.202" + "ip-address": "192.0.2.201" }, -# This is a reservation for a specific client-id. It also shows -# the this client will get a reserved hostname. A hostname can be defined -# for any identifier type, not just client-id. +// This is a reservation for a specific client-id. It also shows +// the this client will get a reserved hostname. A hostname can be defined +// for any identifier type, not just client-id. { "client-id": "01:11:22:33:44:55:66", - "ip-address": "192.0.2.100", + "ip-address": "192.0.2.202", "hostname": "special-snowflake" }, diff --cc doc/examples/kea6/reservations.json index 83663d6da7,bdab965323..59e5e97eec --- a/doc/examples/kea6/reservations.json +++ b/doc/examples/kea6/reservations.json @@@ -43,7 -41,14 +43,14 @@@ { "subnet": "2001:db8:1::/48", + // This directive tells Kea that reservations may be made both in-pool + // and out-of-pool. For improved performance, you may move all reservations + // out of the dynamic pool and change reservation-mode to "out-of-pool". + // Kea will then be able to skip querying for host reservations when + // assigning leases from dynamic pool. + "reservation-mode": "all", + - "pools": [ { "pool": "2001:db8:1::/80" } ], + "pools": [ { "pool": "2001:db8:1::/120" } ], "pd-pools": [ { @@@ -54,16 -59,14 +61,14 @@@ ], "interface": "ethX", - "reservation-mode": "out-of-pool", - -# Host reservations. Define several reservations, note that -# they are all within the range of the pool of the dynamically -# allocated address. The server will exclude the addresses from this -# pool and only assign them to the client which has a reservation for -# them. +// Host reservations. Define several reservations, note that +// they are all within the range of the pool of the dynamically +// allocated address. The server will exclude the addresses from this +// pool and only assign them to the client which has a reservation for +// them. "reservations": [ -# This is a simple host reservation. The host with DUID matching -# the specified value will get an address of 2001:db8:1::100. +// This is a simple host reservation. The host with DUID matching +// the specified value will get an address of 2001:db8:1::100. { "duid": "01:02:03:04:05:0A:0B:0C:0D:0E", "ip-addresses": [ "2001:db8:1::100" ]