diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
commit | 1a9a408a7bf6d7a1a06254ad2939bd549acba69b (patch) | |
tree | ec4f76ea5260e269c83addbfafa4376ea2678059 /cloudinit/distros/arch.py | |
parent | bbf105baafbe788f7babbda188b513180424e256 (diff) | |
parent | 8092805079d011093724d87e9485e5bf79479a72 (diff) | |
download | vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.tar.gz vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.zip |
merge with trunk
Diffstat (limited to 'cloudinit/distros/arch.py')
-rw-r--r-- | cloudinit/distros/arch.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 45fcf26f..93a2e008 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -74,7 +74,7 @@ class Distro(distros.Distro): 'Interface': dev, 'IP': info.get('bootproto'), 'Address': "('%s/%s')" % (info.get('address'), - info.get('netmask')), + info.get('netmask')), 'Gateway': info.get('gateway'), 'DNS': str(tuple(info.get('dns-nameservers'))).replace(',', '') } @@ -86,7 +86,7 @@ class Distro(distros.Distro): if nameservers: util.write_file(self.resolve_conf_fn, - convert_resolv_conf(nameservers)) + convert_resolv_conf(nameservers)) return dev_names @@ -102,7 +102,7 @@ class Distro(distros.Distro): def _bring_up_interface(self, device_name): cmd = ['netctl', 'restart', device_name] LOG.debug("Attempting to run bring up interface %s using command %s", - device_name, cmd) + device_name, cmd) try: (_out, err) = util.subp(cmd) if len(err): |