diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:45:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:45:58 -0500 |
| commit | 8092805079d011093724d87e9485e5bf79479a72 (patch) | |
| tree | 22e58fc368bc1ec27f527c153b8fe6fe27de4997 /cloudinit/sources/DataSourceOpenNebula.py | |
| parent | 3400f839651d308e495d1d8a1d7c1c2b463ad98b (diff) | |
| parent | 63357ed731710b2418810535d9c991adbaea8dcb (diff) | |
| download | vyos-cloud-init-8092805079d011093724d87e9485e5bf79479a72.tar.gz vyos-cloud-init-8092805079d011093724d87e9485e5bf79479a72.zip | |
Apply pep8, pyflakes fixes for python2 and 3
Update make check target to run pep8 and run pyflakes or pyflakes3
depending on the value of 'PYVER'. This way the python3 build
environment does not need python2 and vice versa.
Also have make check run the 'yaml' test.
tox: have tox run pep8 in the pyflakes
Diffstat (limited to 'cloudinit/sources/DataSourceOpenNebula.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index ac2c3b45..681f3a96 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -149,8 +149,8 @@ class BrokenContextDiskDir(Exception): class OpenNebulaNetwork(object): REG_DEV_MAC = re.compile( - r'^\d+: (eth\d+):.*?link\/ether (..:..:..:..:..:..) ?', - re.MULTILINE | re.DOTALL) + r'^\d+: (eth\d+):.*?link\/ether (..:..:..:..:..:..) ?', + re.MULTILINE | re.DOTALL) def __init__(self, ip, context): self.ip = ip @@ -404,7 +404,8 @@ def read_context_disk_dir(source_dir, asuser=None): if ssh_key_var: lines = context.get(ssh_key_var).splitlines() results['metadata']['public-keys'] = [l for l in lines - if len(l) and not l.startswith("#")] + if len(l) and not + l.startswith("#")] # custom hostname -- try hostname or leave cloud-init # itself create hostname from IP address later |