diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-09-29 19:32:49 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-09-29 19:32:49 -0500 |
| commit | 7e1f20a253c28d9063c4d619ee54908e38cddb21 (patch) | |
| tree | 32d6a988931bb56eb3fa6e7c300403f027744465 | |
| parent | fa02c1e5414fb927b79e49cfa1b4692c8beba67b (diff) | |
| download | horizon-7e1f20a253c28d9063c4d619ee54908e38cddb21.tar.gz horizon-7e1f20a253c28d9063c4d619ee54908e38cddb21.tar.bz2 horizon-7e1f20a253c28d9063c4d619ee54908e38cddb21.tar.xz horizon-7e1f20a253c28d9063c4d619ee54908e38cddb21.zip | |
Legalise netaddress when network == false
This allows a sysadmin to specify a post-install network configuration
without using it during the installation.
| -rw-r--r-- | devel/requirements/3b_runner.xml | 4 | ||||
| -rw-r--r-- | devel/script/2_keys.xml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/devel/requirements/3b_runner.xml b/devel/requirements/3b_runner.xml index e933832..82cb0d9 100644 --- a/devel/requirements/3b_runner.xml +++ b/devel/requirements/3b_runner.xml @@ -102,10 +102,6 @@ <title>Runner.Validate.network.netaddress</title> <para>If the value in the HorizonScript for the <literal>network</literal> key is <literal>true</literal>, the system shall verify that at least one <literal>netaddress</literal> key is present.</para> </formalpara> - <formalpara id="Runner.Validate.network.netaddress.NoNetwork"> - <title>Runner.Validate.network.netaddress.NoNetwork</title> - <para>If the value in the HorizonScript for the <literal>network</literal> key is <literal>false</literal>, the system shall verify that no <literal>netaddress</literal> key is present.</para> - </formalpara> <formalpara id="Runner.Validate.network.netaddress.Validity"> <title>Runner.Validate.network.netaddress.Validity</title> <para>The system shall verify that each <literal>netaddress</literal> key has a valid form of at least two values in a space-separated tuple.</para> diff --git a/devel/script/2_keys.xml b/devel/script/2_keys.xml index 59f5c8a..5db959b 100644 --- a/devel/script/2_keys.xml +++ b/devel/script/2_keys.xml @@ -262,7 +262,7 @@ firmware false </para></listitem> <listitem><para>Optionally, the default gateway. The value specified must be a valid IP address of the same family as the IP address specified in item 3.</para></listitem> </orderedlist> - <literal>netaddress</literal> must not appear unless <literal>network</literal> is <literal>true</literal>. If <literal>network</literal> is <literal>true</literal>, then <literal>netaddress</literal> must appear at least once, and may appear up to 255 times per interface. + If <literal>network</literal> is <literal>true</literal>, then <literal>netaddress</literal> must appear at least once. If <literal>network</literal> is <literal>false</literal>, the network configuration specified in <literal>netaddress</literal> will be written to the target computer but will not be used during installation. <literal>netaddress</literal> may appear up to 255 times per interface. </para> </formalpara> <formalpara id="netaddress.default"> |