summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-23 11:48:00 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-23 11:49:46 +0200
commit1f6746c44c5349a35847abfb410d3826a4e7ca99 (patch)
treed67f4c99a994bb4154256593683fadd87f43957b
parent31c97abb63c7223e224c399a7d474f012ecf8a45 (diff)
downloadvyos-1x-1f6746c44c5349a35847abfb410d3826a4e7ca99.tar.gz
vyos-1x-1f6746c44c5349a35847abfb410d3826a4e7ca99.zip
containers: T2216: xml: impove help string for address command
-rw-r--r--interface-definitions/containers.xml.in2
-rwxr-xr-xsrc/conf_mode/containers.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/interface-definitions/containers.xml.in b/interface-definitions/containers.xml.in
index 29762c171..030980dba 100644
--- a/interface-definitions/containers.xml.in
+++ b/interface-definitions/containers.xml.in
@@ -60,7 +60,7 @@
<help>Set IPv4 static address to container (optional)</help>
<valueHelp>
<format>ipv4</format>
- <description>IPv4 address (x.x.x.1 reserved)</description>
+ <description>IPv4 address</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
diff --git a/src/conf_mode/containers.py b/src/conf_mode/containers.py
index b573df889..23f17ab55 100755
--- a/src/conf_mode/containers.py
+++ b/src/conf_mode/containers.py
@@ -124,7 +124,8 @@ def verify(container):
# We can not use the first IP address of a network prefix as this is used by podman
if ip_address(address) == ip_network(network)[1]:
- raise ConfigError(f'Address "{address}" reserved for the container engine!')
+ raise ConfigError(f'IP address "{address}" can not be used for a container, '\
+ 'reserved for the container engine!')
if 'environment' in container_config:
for var, cfg in container_config['environment'].items():