summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWebSpider <WebSpider@users.noreply.github.com>2020-11-03 15:47:03 +0100
committerGitHub <noreply@github.com>2020-11-03 09:47:03 -0500
commit7978feb3af5846a1a2ac489cde83febe975b046d (patch)
tree857ab9bdc3ef6847726f880499941272b61eb5b9
parent2c4500394b2e3b3074468fffc4d91b404304bc39 (diff)
downloadvyos-cloud-init-7978feb3af5846a1a2ac489cde83febe975b046d.tar.gz
vyos-cloud-init-7978feb3af5846a1a2ac489cde83febe975b046d.zip
Fix not sourcing default 50-cloud-init ENI file on Debian (#598)
* Include both Ubuntu-style cfg file, and Debian-style directory in ENI * Add WebSpider as contributor
-rw-r--r--cloudinit/sources/helpers/vmware/imc/config_nic.py1
-rw-r--r--tools/.github-cla-signers1
2 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
index 3745a262..9cd2c0c0 100644
--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
+++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
@@ -275,6 +275,7 @@ class NicConfigurator(object):
"# DO NOT EDIT THIS FILE BY HAND --"
" AUTOMATICALLY GENERATED BY cloud-init",
"source /etc/network/interfaces.d/*.cfg",
+ "source-directory /etc/network/interfaces.d",
]
util.write_file(interfaceFile, content='\n'.join(lines))
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index 2d81b700..fc05f982 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -26,3 +26,4 @@ sshedi
TheRealFalcon
tomponline
tsanghan
+WebSpider