diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2026-05-04 22:56:59 -0500 |
|---|---|---|
| committer | Indrajit Raychaudhuri <irc@indrajit.com> | 2026-05-05 17:18:54 -0500 |
| commit | d194e753f97dcb99928b2ce71bde4fade65f33b9 (patch) | |
| tree | 95564453a631e1600bac36d857347fc4f293609d | |
| parent | 5c4afee8c5bf95b89d1e4437a7a851b648c70a8d (diff) | |
| download | vyos-1x-d194e753f97dcb99928b2ce71bde4fade65f33b9.tar.gz vyos-1x-d194e753f97dcb99928b2ce71bde4fade65f33b9.zip | |
kea: T8763: Fix vendor-encapsulated-options space
Changes:
1. Change option space from 'ubnt' to 'vendor-encapsulated-options-space'.
2. Change option name from 'unifi-controller' to 'ubnt'.
3. Add 'vendor-encapsulated-options' option (in addition to adding unifi
controller IP address under the option name 'ubnt') if unifi-controller
is configured.
| -rw-r--r-- | data/templates/dhcp-server/kea-dhcp4.conf.j2 | 4 | ||||
| -rw-r--r-- | python/vyos/kea.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/data/templates/dhcp-server/kea-dhcp4.conf.j2 b/data/templates/dhcp-server/kea-dhcp4.conf.j2 index 8519689a9..dae2338ae 100644 --- a/data/templates/dhcp-server/kea-dhcp4.conf.j2 +++ b/data/templates/dhcp-server/kea-dhcp4.conf.j2 @@ -41,10 +41,10 @@ "type": "string" }, { - "name": "unifi-controller", + "name": "ubnt", "code": 1, "type": "ipv4-address", - "space": "ubnt" + "space": "vendor-encapsulated-options-space" } ], {% if dynamic_dns_update is vyos_defined %} diff --git a/python/vyos/kea.py b/python/vyos/kea.py index e38347012..5fe070c54 100644 --- a/python/vyos/kea.py +++ b/python/vyos/kea.py @@ -153,8 +153,13 @@ def kea_parse_options(config): config, 'vendor_option', 'ubiquiti', 'unifi_controller' ) if unifi_controller: + options.append({'name': 'vendor-encapsulated-options'}) options.append( - {'name': 'unifi-controller', 'data': unifi_controller, 'space': 'ubnt'} + { + 'name': 'ubnt', + 'data': unifi_controller, + 'space': 'vendor-encapsulated-options-space', + } ) return options |