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 dd2568e3cc768d0a47b290bb1eccb7fa02d3177b..ceb5a965acac0f9135de29e2c6ded7389abf9274 100644 (file)
--- 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 89cd8aff297df1e524b0081ec78a96596e31460a..79aa1c3dcb14d75ae9a25f711e3a6469c09307da 100755 (executable)
--- 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 fe42ec827bd40daecbbc5d7a97e64301ba560da0..7efa1ad034c268281af3808bbb3504bdcaa3e0f0 100644 (file)
--- 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',