From: Zack Cerza <zack@cerza.org>
Date: Sat, 12 Dec 2015 00:04:23 +0000 (-0700)
Subject: Merge pull request #733 from dachary/wip-openstack-instance
X-Git-Tag: 1.1.0~723
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8662262b1ddcf0f570ad8d313167066535cbc24d;p=teuthology.git

Merge pull request #733 from dachary/wip-openstack-instance

openstack: use OpenStackInstance in TeuthologyOpenStack
---

8662262b1ddcf0f570ad8d313167066535cbc24d
diff --cc teuthology/openstack/__init__.py
index fbdfdd38d,ccaaaab32..4fcb8d77b
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@@ -422,10 -438,10 +439,10 @@@ class TeuthologyOpenStack(OpenStack)
          Entry point implementing the teuthology-openstack command.
          """
          self.setup_logs()
 -        misc.read_config(self.args)
 +        set_config_attr(self.args)
          self.key_filename = self.args.key_filename
          self.verify_openstack()
-         ip = self.setup()
+         self.setup()
          if self.args.suite:
              self.run_suite()
          if self.args.key_filename: