From: Zack Cerza <zack@redhat.com>
Date: Thu, 9 Apr 2015 21:42:13 +0000 (-0600)
Subject: Skip passing os_type/version when destroying
X-Git-Tag: 1.1.0~973
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d817bf93bd00188fec84da7186ad1ccfa9b802e;p=teuthology.git

Skip passing os_type/version when destroying

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/provision.py b/teuthology/provision.py
index b283efb36..eca95c046 100644
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -211,8 +211,6 @@ def destroy_if_vm(ctx, machine_name, user=None, description=None,
         status_info = _downburst.status
     else:
         status_info = get_status(machine_name)
-    os_type = get_distro(ctx)
-    os_version = get_distro_version(ctx)
     if not status_info or not status_info.get('is_vm', False):
         return True
     if user is not None and user != status_info['locked_by']:
@@ -228,6 +226,6 @@ def destroy_if_vm(ctx, machine_name, user=None, description=None,
         log.error(msg.format(node=machine_name, desc_arg=description,
                              desc_lock=status_info['description']))
         return False
-    dbrst = _downburst or Downburst(name=machine_name, os_type=os_type,
-                                    os_version=os_version, status=status_info)
+    dbrst = _downburst or Downburst(name=machine_name, os_type=None,
+                                    os_version=None, status=status_info)
     return dbrst.destroy()