From 45bff1e1c6b1a5a1d9d52e109d38680853c58b11 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 17 Feb 2012 10:49:35 -0500 Subject: DataSourceConfigDrive: change 'interfaces' to 'network-interfaces' Instead of a metadata entry named 'interfaces', use 'network-interfaces' which is a somewhat less likely namespace collision. --- cloudinit/DataSourceConfigDrive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit/DataSourceConfigDrive.py') diff --git a/cloudinit/DataSourceConfigDrive.py b/cloudinit/DataSourceConfigDrive.py index 04b9e0ce..af776e08 100644 --- a/cloudinit/DataSourceConfigDrive.py +++ b/cloudinit/DataSourceConfigDrive.py @@ -78,7 +78,7 @@ class DataSourceConfigDrive(DataSource.DataSource): else: log.debug("updating network interfaces from configdrive") - util.write_file("/etc/network/interfaces", md['interfaces']) + util.write_file("/etc/network/interfaces", md['network-interfaces']) try: (out, err) = util.subp(['ifup', '--all']) if len(out) or len(err): @@ -165,7 +165,7 @@ def read_config_drive_dir(source_dir): if "etc/network/interfaces" in found: with open("%s/%s" % (source_dir, "/etc/network/interfaces")) as fp: - md['interfaces'] = fp.read() + md['network-interfaces'] = fp.read() if "root/.ssh/authorized_keys" in found: with open("%s/%s" % (source_dir, "root/.ssh/authorized_keys")) as fp: -- cgit v1.2.3