x/anvil
Code Issues Proposed changes

Checking if cleaner is a file before usage.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-13 23:02:22 -08:00
parent e340811071
commit 7e03ea5d2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/components/nova.py
View File

@ -203,8 +203,10 @@ class NovaUninstaller(comp.PythonUninstallComponent):
env['ENABLED_SERVICES'] = ",".join(sub_components)
env['BIN_DIR'] = self.bindir
env['VOLUME_NAME_PREFIX'] = self.cfg.get('nova', 'volume_name_prefix')
cmd = CLEANER_CMD_ROOT + [sh.joinpths(self.bindir, CLEANER_DATA_CONF)]
sh.execute(*cmd, run_as_root=True, env_overrides=env)
cleaner_fn = sh.joinpths(self.bindir, CLEANER_DATA_CONF)
if sh.isfile(cleaner_fn):
cmd = CLEANER_CMD_ROOT + [cleaner_fn]
sh.execute(*cmd, run_as_root=True, env_overrides=env)
def _clear_libvirt_domains(self):
virt_driver = self.cfg.get('nova', 'virt_driver')