diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-28 11:52:09 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-28 11:52:09 -0400 |
| commit | b3193a4b5204d12825d8317bf0f8c3577c1d8153 (patch) | |
| tree | ffe1b4afe7aa729a78c9596cd0293d001c0abf17 /cloudinit/distros | |
| parent | 6a20a7f0b2a65626c997d0f9264aa293cf4d21f0 (diff) | |
| download | vyos-cloud-init-b3193a4b5204d12825d8317bf0f8c3577c1d8153.tar.gz vyos-cloud-init-b3193a4b5204d12825d8317bf0f8c3577c1d8153.zip | |
distros/debian.py: fix calling of eni renderer to not render link files
Under revno 1243 a failed attempt was made to not render systemd.link
files into /etc/systemd/network/ . The 'config' that was passed in was
incorrect though, and resulted in link files still getting rendered.
(original bug was LP: #1594546).
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/debian.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 5ae9a509..f9b3b92e 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -55,7 +55,6 @@ class Distro(distros.Distro): hostname_conf_fn = "/etc/hostname" locale_conf_fn = "/etc/default/locale" network_conf_fn = "/etc/network/interfaces.d/50-cloud-init.cfg" - links_prefix = "/etc/systemd/network/50-cloud-init-" def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) @@ -67,7 +66,7 @@ class Distro(distros.Distro): self._net_renderer = eni.Renderer({ 'eni_path': self.network_conf_fn, 'eni_header': ENI_HEADER, - 'links_prefix_path': None, + 'links_path_prefix': None, 'netrules_path': None, }) |