import teuthology.lock.query
import teuthology.lock.util
from teuthology.orchestra import run
+from teuthology.orchestra import connection
from teuthology.orchestra.opsys import OS
-import connection
from teuthology import misc
from teuthology.misc import host_shortname
import time
import teuthology.lock.query
from teuthology.misc import decanonicalize_hostname, get_distro, get_distro_version
-import cloud
-import downburst
-import fog
-import openstack
+from teuthology.provision import cloud
+from teuthology.provision import downburst
+from teuthology.provision import fog
+from teuthology.provision import openstack
import os
from teuthology.config import config
-import openstack
+from teuthology.provision.cloud import openstack
log = logging.getLogger(__name__)
from teuthology.config import config
from teuthology.contextutil import safe_while
-import base
-import util
+from teuthology.provision.cloud import base
+from teuthology.provision.cloud import util
from teuthology.provision.cloud.base import Provider