]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge pull request #733 from dachary/wip-openstack-instance
authorZack Cerza <zack@cerza.org>
Sat, 12 Dec 2015 00:04:23 +0000 (17:04 -0700)
committerZack Cerza <zack@cerza.org>
Sat, 12 Dec 2015 00:04:23 +0000 (17:04 -0700)
openstack: use OpenStackInstance in TeuthologyOpenStack

1  2 
teuthology/openstack/__init__.py

index fbdfdd38d9be4a961b5f7a0097037e5be2650430,ccaaaab324ebd325176bbaf2cdd5631a3f5bfa52..4fcb8d77b65a053aa0d8e9ed2a04a9fcd512f9f1
@@@ -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: