diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-21 11:23:52 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-21 11:23:52 -0400 |
| commit | fd816e7e1f9c48d7ab89958f6eee7677fb310932 (patch) | |
| tree | 7544ffdc0d80931b230a8fd9e58350698b8bef92 /cloudinit/distros/debian.py | |
| parent | 575c7030e4ff1bd68ca7229f10c482af00620711 (diff) | |
| parent | e6b594bf2bf4cd40bbfbe9581c2b62f3b77e9123 (diff) | |
| download | vyos-cloud-init-fd816e7e1f9c48d7ab89958f6eee7677fb310932.tar.gz vyos-cloud-init-fd816e7e1f9c48d7ab89958f6eee7677fb310932.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/distros/debian.py')
| -rw-r--r-- | cloudinit/distros/debian.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 53f3aa4d..5ae9a509 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -43,6 +43,13 @@ APT_GET_WRAPPER = { 'enabled': 'auto', } +ENI_HEADER = """# This file is generated from information provided by +# the datasource. Changes to it will not persist across an instance. +# To disable cloud-init's network configuration capabilities, write a file +# /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following: +# network: {config: disabled} +""" + class Distro(distros.Distro): hostname_conf_fn = "/etc/hostname" @@ -59,7 +66,8 @@ class Distro(distros.Distro): self.osfamily = 'debian' self._net_renderer = eni.Renderer({ 'eni_path': self.network_conf_fn, - 'links_prefix_path': self.links_prefix, + 'eni_header': ENI_HEADER, + 'links_prefix_path': None, 'netrules_path': None, }) |