summaryrefslogtreecommitdiff
path: root/cloudinit/distros/debian.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:43 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:43 -0400
commitc00558f3159e0d1c54df3afa16ad8e06db6e30ab (patch)
tree7450e4d94477db02910da4d5118521904c3a89e2 /cloudinit/distros/debian.py
parent90ad4618fd49dae5e833d6ab4d16495911cd5cde (diff)
parentd86e75313524298e52469d4e55fa945ec731e938 (diff)
downloadvyos-cloud-init-c00558f3159e0d1c54df3afa16ad8e06db6e30ab.tar.gz
vyos-cloud-init-c00558f3159e0d1c54df3afa16ad8e06db6e30ab.zip
merge trunk at 0.7.7~bzr1256
Diffstat (limited to 'cloudinit/distros/debian.py')
-rw-r--r--cloudinit/distros/debian.py3
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,
})