x/cloud-init
Code Issues Proposed changes

pyflakes fixes.

Browse Source 
make pyflakes now passes.
This commit is contained in:
Scott Moser 2014-09-10 14:32:37 -04:00
commit 748e90a72e
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudinit/config/cc_set_passwords.py
View File

@ -132,7 +132,7 @@ def handle(_name, cfg, cloud, log, args):
'PasswordAuthentication', 'PasswordAuthentication',
pw_auth)) pw_auth))
lines = [str(e) for e in new_lines] lines = [str(l) for l in new_lines]
util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines)) util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines))
try: try:

2
cloudinit/config/cc_ssh_import_id.py
View File

@ -85,7 +85,7 @@ def import_ssh_ids(ids, user, log):
return return
try: try:
_check = pwd.getpwnam(user) pwd.getpwnam(user)
except KeyError as exc: except KeyError as exc:
raise exc raise exc

2
cloudinit/distros/__init__.py
View File

@ -861,5 +861,5 @@ def set_etc_timezone(tz, tz_file=None, tz_conf="/etc/timezone",
util.write_file(tz_conf, str(tz).rstrip() + "\n") util.write_file(tz_conf, str(tz).rstrip() + "\n")
# This ensures that the correct tz will be used for the system # This ensures that the correct tz will be used for the system
if tz_local and tz_file: if tz_local and tz_file:
util.copy(tz_file, self.tz_local_fn) util.copy(tz_file, tz_local)
return return

2
cloudinit/distros/arch.py
View File

@ -159,7 +159,7 @@ class Distro(distros.Distro):
return hostname return hostname
def set_timezone(self, tz): def set_timezone(self, tz):
set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
def package_command(self, command, args=None, pkgs=None): def package_command(self, command, args=None, pkgs=None):
if pkgs is None: if pkgs is None:

2
cloudinit/distros/debian.py
View File

@ -131,7 +131,7 @@ class Distro(distros.Distro):
return "127.0.1.1" return "127.0.1.1"
def set_timezone(self, tz): def set_timezone(self, tz):
set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
def package_command(self, command, args=None, pkgs=None): def package_command(self, command, args=None, pkgs=None):
if pkgs is None: if pkgs is None:

2
cloudinit/distros/freebsd.py
View File

@ -264,7 +264,7 @@ class Distro(distros.Distro):
if 'dns-nameservers' in info: if 'dns-nameservers' in info:
nameservers.extend(info['dns-nameservers']) nameservers.extend(info['dns-nameservers'])
if 'dns-search' in info: if 'dns-search' in info:
searchservers.extend(info['dns-search']) searchdomains.extend(info['dns-search'])
else: else:
ifconfig = 'DHCP' ifconfig = 'DHCP'

2
cloudinit/distros/gentoo.py
View File

@ -138,7 +138,7 @@ class Distro(distros.Distro):
return hostname return hostname
def set_timezone(self, tz): def set_timezone(self, tz):
set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
def package_command(self, command, args=None, pkgs=None): def package_command(self, command, args=None, pkgs=None):
if pkgs is None: if pkgs is None:

16
cloudinit/sources/DataSourceOpenStack.py
View File

@ -64,13 +64,13 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
try: try:
max_wait = int(self.ds_cfg.get("max_wait", max_wait)) max_wait = int(self.ds_cfg.get("max_wait", max_wait))
except Exception: except Exception as e:
util.logexc(LOG, "Failed to get max wait. using %s", max_wait) LOG.debug("Failed to get max wait. using %s: %s", max_wait, e)
try: try:
timeout = max(0, int(self.ds_cfg.get("timeout", timeout))) timeout = max(0, int(self.ds_cfg.get("timeout", timeout)))
except Exception: except Exception as e:
util.logexc(LOG, "Failed to get timeout, using %s", timeout) LOG.debug("Failed to get timeout, using %s: %s", timeout, e)
return (max_wait, timeout) return (max_wait, timeout)
def wait_for_metadata_service(self): def wait_for_metadata_service(self):
@ -82,7 +82,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
if len(filtered): if len(filtered):
urls = filtered urls = filtered
else: else:
LOG.warn("Empty metadata url list! using default list") LOG.debug("Empty metadata url list! using default list")
urls = [DEF_MD_URL] urls = [DEF_MD_URL]
md_urls = [] md_urls = []
@ -123,9 +123,9 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
'version': openstack.OS_HAVANA}) 'version': openstack.OS_HAVANA})
except openstack.NonReadable: except openstack.NonReadable:
return False return False
except (openstack.BrokenMetadata, IOError): except (openstack.BrokenMetadata, IOError) as e:
util.logexc(LOG, "Broken metadata address %s", LOG.debug("Broken metadata address %s: %s",
self.metadata_address) self.metadata_address, e)
return False return False
user_dsmode = results.get('dsmode', None) user_dsmode = results.get('dsmode', None)

14
cloudinit/sources/helpers/openstack.py
View File

@ -163,10 +163,10 @@ class BaseReader(object):
def _find_working_version(self, version): def _find_working_version(self, version):
try: try:
versions_available = self._fetch_available_versions(self) versions_available = self._fetch_available_versions()
except Exception as e: except Exception as e:
LOG.warn("Unable to read openstack versions from %s due to: %s", LOG.debug("Unable to read openstack versions from %s due to: %s",
self.base_path, e) self.base_path, e)
versions_available = [] versions_available = []
search_versions = [version] + list(OS_VERSIONS) search_versions = [version] + list(OS_VERSIONS)
@ -178,8 +178,8 @@ class BaseReader(object):
break break
if selected_version != version: if selected_version != version:
LOG.warn("Version '%s' not available, attempting to use" LOG.debug("Version '%s' not available, attempting to use"
" version '%s' instead", version, selected_version) " version '%s' instead", version, selected_version)
return selected_version return selected_version
def _read_content_path(self, item): def _read_content_path(self, item):
@ -239,7 +239,8 @@ class BaseReader(object):
LOG.debug("Failed reading optional path %s due" LOG.debug("Failed reading optional path %s due"
" to: %s", path, e) " to: %s", path, e)
else: else:
LOG.exception("Failed reading mandatory path %s", path) LOG.debug("Failed reading mandatory path %s due"
" to: %s", path, e)
else: else:
found = True found = True
if required and not found: if required and not found:
@ -420,6 +421,7 @@ class MetadataReader(BaseReader):
if self._versions is not None: if self._versions is not None:
return self.os_versions return self.os_versions
found = [] found = []
version_path = self._path_join(self.base_path, "openstack")
content = self._path_read(version_path) content = self._path_read(version_path)
for line in content.splitlines(): for line in content.splitlines():
line = line.strip() line = line.strip()

9
tests/unittests/test_data.py
View File

@ -106,7 +106,7 @@ class TestConsumeUserData(helpers.FilesystemMockingTestCase):
initer.read_cfg() initer.read_cfg()
initer.initialize() initer.initialize()
initer.fetch() initer.fetch()
_iid = initer.instancify() initer.instancify()
initer.update() initer.update()
initer.cloudify().run('consume_data', initer.cloudify().run('consume_data',
initer.consume_data, initer.consume_data,
@ -145,7 +145,7 @@ class TestConsumeUserData(helpers.FilesystemMockingTestCase):
initer.read_cfg() initer.read_cfg()
initer.initialize() initer.initialize()
initer.fetch() initer.fetch()
_iid = initer.instancify() initer.instancify()
initer.update() initer.update()
initer.cloudify().run('consume_data', initer.cloudify().run('consume_data',
initer.consume_data, initer.consume_data,
@ -221,7 +221,7 @@ run:
initer.read_cfg() initer.read_cfg()
initer.initialize() initer.initialize()
initer.fetch() initer.fetch()
_iid = initer.instancify() initer.instancify()
initer.update() initer.update()
initer.cloudify().run('consume_data', initer.cloudify().run('consume_data',
initer.consume_data, initer.consume_data,
@ -256,7 +256,7 @@ vendor_data:
initer.read_cfg() initer.read_cfg()
initer.initialize() initer.initialize()
initer.fetch() initer.fetch()
_iid = initer.instancify() initer.instancify()
initer.update() initer.update()
initer.cloudify().run('consume_data', initer.cloudify().run('consume_data',
initer.consume_data, initer.consume_data,
@ -264,7 +264,6 @@ vendor_data:
freq=PER_INSTANCE) freq=PER_INSTANCE)
mods = stages.Modules(initer) mods = stages.Modules(initer)
(_which_ran, _failures) = mods.run_section('cloud_init_modules') (_which_ran, _failures) = mods.run_section('cloud_init_modules')
_cfg = mods.cfg
vendor_script = initer.paths.get_ipath_cur('vendor_scripts') vendor_script = initer.paths.get_ipath_cur('vendor_scripts')
vendor_script_fns = "%s%s/part-001" % (new_root, vendor_script) vendor_script_fns = "%s%s/part-001" % (new_root, vendor_script)
self.assertTrue(os.path.exists(vendor_script_fns)) self.assertTrue(os.path.exists(vendor_script_fns))

1
tests/unittests/test_datasource/test_nocloud.py
View File

@ -57,7 +57,6 @@ class TestNoCloudDataSource(MockerTestCase):
pass pass
def my_find_devs_with(*args, **kwargs): def my_find_devs_with(*args, **kwargs):
_f = (args, kwargs)
raise PsuedoException raise PsuedoException
self.apply_patches([(util, 'find_devs_with', my_find_devs_with)]) self.apply_patches([(util, 'find_devs_with', my_find_devs_with)])

2
tests/unittests/test_runs/test_merge_run.py
View File

@ -33,7 +33,7 @@ class TestMergeRun(helpers.FilesystemMockingTestCase):
initer.initialize() initer.initialize()
initer.fetch() initer.fetch()
initer.datasource.userdata_raw = ud initer.datasource.userdata_raw = ud
_iid = initer.instancify() initer.instancify()
initer.update() initer.update()
initer.cloudify().run('consume_data', initer.cloudify().run('consume_data',
initer.consume_data, initer.consume_data,