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

Fixes related to ProvisionOpenStack.destroy()

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

diff --cc teuthology/openstack/__init__.py
index 0fe8d7125bbec0e82ab718ec6a809875a32ebc70,8a4eee5d700b6ca15e9cd1a6cf072dcd0749c12b..d0a4ba246a54024fd530339877376b5b51d84969
--- 1/teuthology/openstack/__init__.py
--- 2/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

diff --cc teuthology/provision.py
Simple merge