From: Loic Dachary <loic@dachary.org>
Date: Sat, 24 Oct 2015 07:38:30 +0000 (+0200)
Subject: Merge pull request #670 from ceph/wip-nuke-ovh
X-Git-Tag: 1.1.0~782
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f4dea568463d2a08da2abdec5f795da84258df4;p=teuthology.git

Merge pull request #670 from ceph/wip-nuke-ovh

Fixes related to ProvisionOpenStack.destroy()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

2f4dea568463d2a08da2abdec5f795da84258df4
diff --cc teuthology/openstack/__init__.py
index 0fe8d7125b,8a4eee5d70..d0a4ba246a
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@@ -31,8 -30,9 +31,10 @@@ import socke
  import subprocess
  import tempfile
  import teuthology
 +import types
  
+ from subprocess import CalledProcessError
+ 
  from teuthology.contextutil import safe_while
  from teuthology.config import config as teuth_config
  from teuthology.orchestra import connection