From c8464e23e73f554db3ce0b248a9639b113394270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Myyr=C3=A4?= Date: Mon, 28 Dec 2020 18:56:00 +0200 Subject: [PATCH 1/3] doc: document missing IPv6 subnet types --- doc/rtd/topics/network-config-format-v1.rst | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/rtd/topics/network-config-format-v1.rst b/doc/rtd/topics/network-config-format-v1.rst index 92e81897a9a..52f73014f9e 100644 --- a/doc/rtd/topics/network-config-format-v1.rst +++ b/doc/rtd/topics/network-config-format-v1.rst @@ -414,9 +414,19 @@ Subnet types are one of the following: - ``dhcp6``: Configure this interface with IPv6 dhcp. - ``static``: Configure this interface with a static IPv4. - ``static6``: Configure this interface with a static IPv6 . +- ``ipv6_dhcpv6-stateful``: Configure this interface with IPv6 DHCP (similar to ``dhcp6``) +- ``ipv6_dhcpv6-stateless``: Configure this interface with SLAAC and DHCP +- ``ipv6_slaac``: Configure address with SLAAC -When making use of ``dhcp`` types, no additional configuration is needed in -the subnet dictionary. +When making use of ``dhcp`` or either of the ``ipv6_dhcpv6`` types, no additional +configuration is needed in the subnet dictionary. + +Using ``ipv6_dhcpv6-stateless`` or ``ipv6_slaac`` allows the IPv6 address to be +automatically configured with StateLess Address AutoConfiguration (`SLAAC`_). +SLAAC requires support from the network, so verify that your cloud or network +offering has support before trying it out. With ``ipv6_dhcpv6-stateless``, +DHCPv6 is still used to fetch other subnet details such as gateway or DNS +servers. If you only want to discover the address, use ``ipv6_slaac``. **Subnet DHCP Example**:: @@ -603,4 +613,6 @@ Some more examples to explore the various options available. - dellstack type: nameserver +.. _SLAAC: https://tools.ietf.org/html/rfc4862 + .. vi: textwidth=78 From fd6f3dda810865d8816bca3fcaae5dec5f90cb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Myyr=C3=A4?= Date: Mon, 28 Dec 2020 22:01:49 +0200 Subject: [PATCH 2/3] doc: styling fix for line length limit. --- doc/rtd/topics/network-config-format-v1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rtd/topics/network-config-format-v1.rst b/doc/rtd/topics/network-config-format-v1.rst index 52f73014f9e..a0fd415b4e3 100644 --- a/doc/rtd/topics/network-config-format-v1.rst +++ b/doc/rtd/topics/network-config-format-v1.rst @@ -414,12 +414,12 @@ Subnet types are one of the following: - ``dhcp6``: Configure this interface with IPv6 dhcp. - ``static``: Configure this interface with a static IPv4. - ``static6``: Configure this interface with a static IPv6 . -- ``ipv6_dhcpv6-stateful``: Configure this interface with IPv6 DHCP (similar to ``dhcp6``) +- ``ipv6_dhcpv6-stateful``: Configure interface with ``dhcp6`` - ``ipv6_dhcpv6-stateless``: Configure this interface with SLAAC and DHCP - ``ipv6_slaac``: Configure address with SLAAC -When making use of ``dhcp`` or either of the ``ipv6_dhcpv6`` types, no additional -configuration is needed in the subnet dictionary. +When making use of ``dhcp`` or either of the ``ipv6_dhcpv6`` types, +no additional configuration is needed in the subnet dictionary. Using ``ipv6_dhcpv6-stateless`` or ``ipv6_slaac`` allows the IPv6 address to be automatically configured with StateLess Address AutoConfiguration (`SLAAC`_). From 81df34b1108bacebe929c7d1cf1f60e5b1aa076c Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 7 Jan 2021 09:55:25 -0500 Subject: [PATCH 3/3] Update doc/rtd/topics/network-config-format-v1.rst --- doc/rtd/topics/network-config-format-v1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rtd/topics/network-config-format-v1.rst b/doc/rtd/topics/network-config-format-v1.rst index a0fd415b4e3..17732c2abf3 100644 --- a/doc/rtd/topics/network-config-format-v1.rst +++ b/doc/rtd/topics/network-config-format-v1.rst @@ -414,7 +414,7 @@ Subnet types are one of the following: - ``dhcp6``: Configure this interface with IPv6 dhcp. - ``static``: Configure this interface with a static IPv4. - ``static6``: Configure this interface with a static IPv6 . -- ``ipv6_dhcpv6-stateful``: Configure interface with ``dhcp6`` +- ``ipv6_dhcpv6-stateful``: Configure this interface with ``dhcp6`` - ``ipv6_dhcpv6-stateless``: Configure this interface with SLAAC and DHCP - ``ipv6_slaac``: Configure address with SLAAC