From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 26 Mar 2016 18:39:22 +0000 (+0100)
Subject: openstack: add get_provider() to match set_provider()
X-Git-Tag: 1.1.0~259^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b26fa609f32bc1c922dc123783d0d5154ca7fcd;p=teuthology.git

openstack: add get_provider() to match set_provider()

So that set_provider does not need to be called explicitly before using
the .provider data member.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 3e76997dd..05902f919 100644
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -353,7 +353,7 @@ class OpenStack(object):
         else:
             image = name + ".qcow2"
             disk_format = 'qcow2'
-        if self.provider == 'runabove':
+        if self.get_provider() == 'runabove':
             properties = [
                 "--property architecture_restrict=" + arch,
                 "--property architecture=" + arch
@@ -555,8 +555,8 @@ class OpenStack(object):
     def get_ip(self, instance_id, network):
         return OpenStackInstance(instance_id).get_ip(network)
 
-    def get_available_arch(self):
-        if (self.provider == 'runabove' and
+    def get_available_archs(self):
+        if (self.get_provider() == 'runabove' and
             'HZ1' in os.environ.get('OS_REGION_NAME', '')):
             return ('aarch64',)
         else: