x/anvil
Code Issues Proposed changes

Some small cleanups around libvirt domain clearing.

Browse Source
This commit is contained in:
Joshua Harlow
2012-02-07 17:46:39 -08:00
parent 4496b43fe3
commit a02aa73394
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/components/nova.py
View File

@@ -209,10 +209,11 @@ class NovaUninstaller(comp.PythonUninstallComponent):
def _clear_domains(self): def _clear_domains(self):
libvirt_type = self.cfg.get('nova', 'libvirt_type') libvirt_type = self.cfg.get('nova', 'libvirt_type')
inst_prefix = self.cfg.get('nova', 'instance_name_prefix') inst_prefix = self.cfg.get('nova', 'instance_name_prefix')
virt_protocol = LIBVIRT_PROTOCOL_MAP.get(libvirt_type) vir_driver = self.cfg.get('nova', 'virt_driver')
if virt_protocol and inst_prefix: if vir_driver == 'libvirt' and inst_prefix and libvirt_type:
#attempt to clear out dead domains #attempt to clear out dead domains
#late import so this is not always required #late import so this is not always required
virt_protocol = LIBVIRT_PROTOCOL_MAP[libvirt_type]
try: try:
import libvirt import libvirt
with sh.Rooted(True): with sh.Rooted(True):