diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-06-25 20:41:42 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-06-25 20:41:42 +0000 |
| commit | b993b0a308b2e8182beef965ff57e9a7974f5e17 (patch) | |
| tree | 96b209269951d53ad4453b9b02d95ebb91b883bb /doc | |
| parent | feebec1cbb462208003460d68d909e76cb68e0e2 (diff) | |
| download | vyos-cloud-init-b993b0a308b2e8182beef965ff57e9a7974f5e17.tar.gz vyos-cloud-init-b993b0a308b2e8182beef965ff57e9a7974f5e17.zip | |
doc: indicate that netplan is default in Ubuntu now
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rtd/topics/network-config-format-v2.rst | 2 | ||||
| -rw-r--r-- | doc/rtd/topics/network-config.rst | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/rtd/topics/network-config-format-v2.rst b/doc/rtd/topics/network-config-format-v2.rst index ea370ef5..50f5fa61 100644 --- a/doc/rtd/topics/network-config-format-v2.rst +++ b/doc/rtd/topics/network-config-format-v2.rst @@ -14,7 +14,7 @@ it must include ``version: 2`` and one or more of possible device Cloud-init will read this format from system config. For example the following could be present in -``/etc/cloud/cloud.cfg.d/custom-networking.cfg``: +``/etc/cloud/cloud.cfg.d/custom-networking.cfg``:: network: version: 2 diff --git a/doc/rtd/topics/network-config.rst b/doc/rtd/topics/network-config.rst index 1e994551..51ced4d1 100644 --- a/doc/rtd/topics/network-config.rst +++ b/doc/rtd/topics/network-config.rst @@ -163,10 +163,11 @@ found in Ubuntu and Debian. - **Netplan** -Since Ubuntu 16.10, codename Yakkety, the ``netplan`` project has been an -optional network configuration tool which consumes :ref:`network_config_v2` -input and renders network configuration for supported backends such as -``systemd-networkd`` and ``NetworkManager``. +Introduced in Ubuntu 16.10 (Yakkety Yak), `netplan <https://netplan.io/>`_ has +been the default network configuration tool in Ubuntu since 17.10 (Artful +Aardvark). netplan consumes :ref:`network_config_v2` input and renders +network configuration for supported backends such as ``systemd-networkd`` and +``NetworkManager``. - **Sysconfig** |