diff options
| author | Eric Desrochers <eric.desrochers@canonical.com> | 2018-05-25 09:40:14 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-06-07 16:44:37 +0100 |
| commit | c0961f69d6311160c27e12e7294954e88c5af05b (patch) | |
| tree | 40cd4334a211c3cf1b74c36520a6c510ba657d79 | |
| parent | c3c4603a7b897b13769096d93220d130e73b52cd (diff) | |
| download | sos-c0961f69d6311160c27e12e7294954e88c5af05b.tar.gz | |
netplan conf files can exist in 3 locations
Configuration files can exist in three different locations
with the precedence from most important to least as follows:
/run/netplan/*.yaml
/etc/netplan/*.yaml
/lib/netplan/*.yaml
Alphabetically later files, no matter what directory in, will
amend keys if the key does not already exist and override previous keys if they do.
Resolves: #1318
Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/networking.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index 094caf07..ad3bcd22 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -293,7 +293,9 @@ class UbuntuNetworking(Networking, UbuntuPlugin, DebianPlugin): "/etc/ufw", "/var/log/ufw.Log", "/etc/resolv.conf", + "/run/netplan/*.yaml", "/etc/netplan/*.yaml", + "/lib/netplan/*.yaml", "/run/systemd/network" ]) self.add_cmd_output([ |