summaryrefslogtreecommitdiff
path: root/docs/_include
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-27 19:10:54 +0100
committerChristian Poessinger <christian@poessinger.com>2020-11-27 19:10:54 +0100
commit865e4632a2f1dd52f443c072fda5c629dc38ac72 (patch)
tree6fb3cea003a4b08e7cd81c5889c5bcde3855ca97 /docs/_include
parent4bc9e94a7ad57ee6735533da59a808dc8caf3ba5 (diff)
downloadvyos-documentation-865e4632a2f1dd52f443c072fda5c629dc38ac72.tar.gz
vyos-documentation-865e4632a2f1dd52f443c072fda5c629dc38ac72.zip
include: ipv6: combine autoconf and eui64 into a single file
Diffstat (limited to 'docs/_include')
-rw-r--r--docs/_include/interface-common.txt6
-rw-r--r--docs/_include/interface-ipv6-addr-eui64.txt9
-rw-r--r--docs/_include/interface-ipv6-address.txt (renamed from docs/_include/interface-ipv6-addr-autoconf.txt)11
-rw-r--r--docs/_include/interface-vlan-8021ad.txt12
-rw-r--r--docs/_include/interface-vlan-8021q.txt9
5 files changed, 14 insertions, 33 deletions
diff --git a/docs/_include/interface-common.txt b/docs/_include/interface-common.txt
index de29356f..f9bc640a 100644
--- a/docs/_include/interface-common.txt
+++ b/docs/_include/interface-common.txt
@@ -22,11 +22,7 @@
:var0: {{ var0 }}
:var1: {{ var1 }}
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
- :var0: {{ var0 }}
- :var1: {{ var1 }}
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
+.. cmdinclude:: ../_include/interface-ipv6-address.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
diff --git a/docs/_include/interface-ipv6-addr-eui64.txt b/docs/_include/interface-ipv6-addr-eui64.txt
deleted file mode 100644
index e6a58372..00000000
--- a/docs/_include/interface-ipv6-addr-eui64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-.. cfgcmd:: set interfaces {{ var0 }} <interface> {{ var2 }} {{ var3 }}
- {{ var5 }} {{ var6 }} ipv6 address eui64 <prefix>
-
- :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
- :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address.
-
- .. code-block:: none
-
- set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address eui64 2001:db8:beef::/64
diff --git a/docs/_include/interface-ipv6-addr-autoconf.txt b/docs/_include/interface-ipv6-address.txt
index fea1125e..bde3f50d 100644
--- a/docs/_include/interface-ipv6-addr-autoconf.txt
+++ b/docs/_include/interface-ipv6-address.txt
@@ -17,3 +17,14 @@
.. code-block:: none
set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address autoconf
+
+
+.. cfgcmd:: set interfaces {{ var0 }} <interface> {{ var2 }} {{ var3 }}
+ {{ var5 }} {{ var6 }} ipv6 address eui64 <prefix>
+
+ :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
+ :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address.
+
+ .. code-block:: none
+
+ set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address eui64 2001:db8:beef::/64
diff --git a/docs/_include/interface-vlan-8021ad.txt b/docs/_include/interface-vlan-8021ad.txt
index a1e971be..6ccfbe82 100644
--- a/docs/_include/interface-vlan-8021ad.txt
+++ b/docs/_include/interface-vlan-8021ad.txt
@@ -88,17 +88,7 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG
:var6: <vlan-id>
:var7: 20
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
- :var0: {{ var0 }}
- :var1: {{ var1 }}
- :var2: vif-s
- :var3: <vlan-id>
- :var4: 1000
- :var5: vif-c
- :var6: <vlan-id>
- :var7: 20
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
+.. cmdinclude:: ../_include/interface-ipv6-address.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif-s
diff --git a/docs/_include/interface-vlan-8021q.txt b/docs/_include/interface-vlan-8021q.txt
index 2c7e58f7..69e8227f 100644
--- a/docs/_include/interface-vlan-8021q.txt
+++ b/docs/_include/interface-vlan-8021q.txt
@@ -71,14 +71,7 @@ term used for this is ``vif``.
:var3: <vlan-id>
:var4: 10
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
- :var0: {{ var0 }}
- :var1: {{ var1 }}
- :var2: vif
- :var3: <vlan-id>
- :var4: 10
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
+.. cmdinclude:: ../_include/interface-ipv6-address.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif