openstack: add new OVH flavors to filter list

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index f2aced1b1cab98957b968196552be9aee80bef75..c42b03c23b3bcdf497b1c79a0589014cbb50679e 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -895,7 +895,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|sg|c2)-.*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 3036e39e98e645a66bd67811c275c0ca90dd8ac7..bc78721c47663709d9e33e2a186d5906d3245469 100755 (executable)
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -637,7 +637,7 @@ function main() {
 
     case $provider in
         ovh)
-            flavor_select='^(vps|hg)-.*ssd'
+            flavor_select='^(vps|hg|sg|c2)-.*ssd'
             ;;
     esac
 

diff --git a/teuthology/task/buildpackages.py b/teuthology/task/buildpackages.py
index ac7a17b44caa5f04173c81b6a8398d9e3afd02b1..40df7f20cad65014ac3f41fa12d95570a3229af2 100644 (file)
--- a/teuthology/task/buildpackages.py
+++ b/teuthology/task/buildpackages.py
@@ -182,7 +182,7 @@ def task(ctx, config):
         openstack = OpenStack()
         openstack.set_provider()
         if openstack.provider == 'ovh':
-            select = '^(vps|hg)-.*ssd'
+            select = '^(vps|hg|sg|c2)-.*ssd'
         else:
             select = ''
         network = openstack.net()