cloud-init-dev team mailing list archive

[LÉNÁRT János <ocsi@xxxxxxxxxx>]

LÉNÁRT János has proposed merging ~ocsi/cloud-init:fix-eni-filename into cloud-init:master.

Commit message:
Fixed filename for eni configuration file

On Debian, ifupdown uses `source-directory /etc/network/interfaces.d` (for
new installs) to include files.
https://salsa.debian.org/debian/ifupdown/blob/master/debian/postinst#L23

The current filename, 50-cloud-init.cfg, does not match against the RE
that is used to scan the directory for configurations (ASCII upper- and 
lower-case letters, ASCII digits, ASCII underscores, and ASCII minus-hyphens):
https://salsa.debian.org/debian/ifupdown/blob/master/interfaces.5.pre#L122

Of course many installations use `source /etc/network/interfaces.d/*`,
but not all.


Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~ocsi/cloud-init/+git/cloud-init/+merge/367146
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~ocsi/cloud-init:fix-eni-filename into cloud-init:master.

diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index d517fb8..0ad93ff 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -36,14 +36,14 @@ ENI_HEADER = """# This file is generated from information provided by
 # network: {config: disabled}
 """
 
-NETWORK_CONF_FN = "/etc/network/interfaces.d/50-cloud-init.cfg"
+NETWORK_CONF_FN = "/etc/network/interfaces.d/50-cloud-init"
 LOCALE_CONF_FN = "/etc/default/locale"
 
 
 class Distro(distros.Distro):
     hostname_conf_fn = "/etc/hostname"
     network_conf_fn = {
-        "eni": "/etc/network/interfaces.d/50-cloud-init.cfg",
+        "eni": "/etc/network/interfaces.d/50-cloud-init",
         "netplan": "/etc/netplan/50-cloud-init.yaml"
     }
     renderer_configs = {