1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Description: Do not reprioritize netplan before eni on stable releases.
Retain default network renderer behavior which prioritizes
rendering /etc/network/interfaces before /etc/netplan.
Author: Chad Smith <chad.smith@canonical.com>
Origin: backport
Forwarded: not-needed
Last-Update: 2020-06-01
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -218,10 +218,7 @@ system_info:
groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
shell: /bin/bash
-{# SRU_BLOCKER: do not ship network renderers on Xenial, Bionic or Eoan #}
- network:
- renderers: ['netplan', 'eni', 'sysconfig']
- activators: ['netplan', 'eni', 'network-manager', 'networkd']
+{# SRU_UPSTREAM_COMMIT: 4fb6fd8a. Do not ship network renderers #}
# Automatically discover the best ntp_client
ntp_client: auto
# Other config here will be given to the distro class and/or path classes
--- a/tests/unittests/test_render_cloudcfg.py
+++ b/tests/unittests/test_render_cloudcfg.py
@@ -82,7 +82,6 @@ class TestRenderCloudCfg:
("freebsd", ["freebsd"]),
("netbsd", ["netbsd"]),
("openbsd", ["openbsd"]),
- ("ubuntu", ["netplan", "eni", "sysconfig"]),
),
)
def test_variant_sets_network_renderer_priority_in_cloud_cfg(
|
