From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 27 May 2016 07:14:00 +0000 (+0200)
Subject: openstack: ovh renamed flavors : s/eg/hg/ (part 3)
X-Git-Tag: 1.1.0~259^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=78816e134a2b691d15ed5e566525a760a7c2bb28;p=teuthology.git

openstack: ovh renamed flavors : s/eg/hg/ (part 3)

http://travaux.ovh.net/?do=details&id=17532

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

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index dd2568e3cc..ceb5a965ac 100644
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -883,7 +883,7 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
 
         select = None
         if self.get_provider() == 'ovh':
-            select = '^(vps|hg)-.*-ssd'
+            select = '^(vps|hg)-.*ssd'
         return super(TeuthologyOpenStack, self).flavor(hint, arch, select)
 
     def net(self):
diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index 89cd8aff29..79aa1c3dcb 100755
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -551,7 +551,7 @@ function main() {
 
     case $provider in
         ovh)
-            flavor_select='^(vps|hg)-.*-ssd'
+            flavor_select='^(vps|hg)-.*ssd'
             ;;
     esac
 
diff --git a/teuthology/openstack/test/test_openstack.py b/teuthology/openstack/test/test_openstack.py
index fe42ec827b..7efa1ad034 100644
--- a/teuthology/openstack/test/test_openstack.py
+++ b/teuthology/openstack/test/test_openstack.py
@@ -409,7 +409,7 @@ class TestOpenStack(object):
     @patch('teuthology.misc.sh')
     def test_sorted_flavors(self, m_sh):
         o = OpenStack()
-        select = '^(vps|hg)-.*-ssd'
+        select = '^(vps|hg)-.*ssd'
         m_sh.return_value = TestOpenStack.flavors
         flavors = o.get_sorted_flavors('arch', select)
         assert ['vps-ssd-1',