summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-10-25 21:04:04 +0200
committerGitHub <noreply@github.com>2021-10-25 21:04:04 +0200
commitd9b1c3dff9aed30fd79aad3f317e2388d4bae719 (patch)
treef49bf2a034364ef9b04fbaf22f8cda28997581c5 /src
parent639b2982bbcc72b962bea740a36294ab3d88cbc3 (diff)
parentb1db3de80b8b5f4e2dcbc6d687d342986345c4b2 (diff)
downloadvyos-1x-d9b1c3dff9aed30fd79aad3f317e2388d4bae719.tar.gz
vyos-1x-d9b1c3dff9aed30fd79aad3f317e2388d4bae719.zip
Merge pull request #1037 from sever-sever/T2683
hosts: T2683: Allow multiple entries for static-host-mapping
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/host_name.py2
-rwxr-xr-xsrc/services/vyos-hostsd2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index a7135911d..87bad0dc6 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -79,7 +79,7 @@ def get_config(config=None):
# system static-host-mapping
for hn in conf.list_nodes(['system', 'static-host-mapping', 'host-name']):
hosts['static_host_mapping'][hn] = {}
- hosts['static_host_mapping'][hn]['address'] = conf.return_value(['system', 'static-host-mapping', 'host-name', hn, 'inet'])
+ hosts['static_host_mapping'][hn]['address'] = conf.return_values(['system', 'static-host-mapping', 'host-name', hn, 'inet'])
hosts['static_host_mapping'][hn]['aliases'] = conf.return_values(['system', 'static-host-mapping', 'host-name', hn, 'alias'])
return hosts
diff --git a/src/services/vyos-hostsd b/src/services/vyos-hostsd
index 4c4bb036e..f4b1d0fc2 100755
--- a/src/services/vyos-hostsd
+++ b/src/services/vyos-hostsd
@@ -317,7 +317,7 @@ hosts_add_schema = op_type_schema.extend({
'data': {
str: {
str: {
- 'address': str,
+ 'address': [str],
'aliases': [str]
}
}