cloud/openstack: add ssh_interface property

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>

diff --git a/teuthology/provision/cloud/openstack.py b/teuthology/provision/cloud/openstack.py
index 7653c72b7d568c51f0fc56c8ab5e3f205cfc367c..69868a5a08801bafc5ed20d164a3534d43525091 100644 (file)
--- a/teuthology/provision/cloud/openstack.py
+++ b/teuthology/provision/cloud/openstack.py
@@ -74,6 +74,12 @@ class OpenStackProvider(Provider):
             driver_args['ex_force_base_url'] = self._auth_token.endpoint
         return driver_args
 
+    @property
+    def ssh_interface(self):
+        if not hasattr(self, '_ssh_interface'):
+            self._ssh_interface = self.conf.get('ssh_interface', 'public_ips')
+        return self._ssh_interface
+
     @property
     def images(self):
         if not hasattr(self, '_images'):
@@ -202,6 +208,7 @@ class OpenStackProvisioner(base.Provisioner):
         results = retry(
             self.provider.driver.wait_until_running,
             nodes=[self.node],
+            ssh_interface=self.provider.ssh_interface,
         )
         self._node, self.ips = results[0]
         log.debug("Node started: %s", self.node)