diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
| commit | 24e32edfc4dbce532dde1d858fbdd7beebefb3aa (patch) | |
| tree | 9aeba34bc027109687a3a429c675cb33a10a56e5 /cloudinit/distros | |
| parent | 4de52eb92333245f2c88e386d57c16547b89ab97 (diff) | |
| parent | 38c851e58e09c5574661ef4b2d2e66f6e38063d1 (diff) | |
| download | vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.tar.gz vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/freebsd.py | 3 | ||||
| -rw-r--r-- | cloudinit/distros/net_util.py | 1 | ||||
| -rw-r--r-- | cloudinit/distros/rhel.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py index ee23fd20..9216510e 100644 --- a/cloudinit/distros/freebsd.py +++ b/cloudinit/distros/freebsd.py @@ -119,7 +119,8 @@ class Distro(distros.Distro): index = n.group(0) (out, err) = util.subp(['ifconfig', '-a']) - ifconfigoutput = [x for x in (out.strip()).splitlines() if len(x.split()) > 0] + ifconfigoutput = [x for x in (out.strip()).splitlines() + if len(x.split()) > 0] for line in ifconfigoutput: m = re.match('^\w+', line) if m: diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py index dd63a6a3..8b28e2d1 100644 --- a/cloudinit/distros/net_util.py +++ b/cloudinit/distros/net_util.py @@ -180,4 +180,3 @@ def translate_network(settings): if cmd == 'iface' and 'inet6' in args: real_ifaces[dev_name]['inet6'] = True return real_ifaces - diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index d5cc15fe..d9588632 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -91,7 +91,7 @@ class Distro(distros.Distro): 'IPV6INIT': _make_sysconfig_bool(True), 'IPV6ADDR': info.get('ipv6').get('address'), 'IPV6_DEFAULTGW': info.get('ipv6').get('gateway'), - }) + }) rhel_util.update_sysconfig_file(net_fn, net_cfg) if 'dns-nameservers' in info: nameservers.extend(info['dns-nameservers']) |