openstack: allow setting of teuthology VM params from command line

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

diff --git a/scripts/openstack.py b/scripts/openstack.py
index 299b371cb3130f771c6e5a010e48185c9cd07f9d..c8179b3d8fcdb0f3463feea8d6e9415b01a1f7f5 100644 (file)
--- a/scripts/openstack.py
+++ b/scripts/openstack.py
@@ -202,6 +202,24 @@ def get_openstack_parser():
         type=int,
         default=1,
     )
+    parser.add_argument(
+        '--controller-cpus',
+        help='override default minimum vCPUs when selecting flavor for teuthology VM',
+        type=int,
+        default=0,
+    )
+    parser.add_argument(
+        '--controller-ram',
+        help='override default minimum RAM (in megabytes) when selecting flavor for teuthology VM',
+        type=int,
+        default=0,
+    )
+    parser.add_argument(
+        '--controller-disk',
+        help='override default minimum disk size (in gigabytes) when selecting flavor for teuthology VM',
+        type=int,
+        default=0,
+    )
     parser.add_argument(
         '--teardown',
         action='store_true', default=None,

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index c42b03c23b3bcdf497b1c79a0589014cbb50679e..790f68406d7f087e8dfe038059d223d2a92e0e91 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -735,7 +735,10 @@ class TeuthologyOpenStack(OpenStack):
                                     '--archive-upload-url',
                                     '--key-name',
                                     '--key-filename',
-                                    '--simultaneous-jobs'):
+                                    '--simultaneous-jobs',
+                                    '--controller-cpus',
+                                    '--controller-ram',
+                                    '--controller-disk'):
                 del original_argv[0:2]
             elif original_argv[0] in ('--teardown',
                                       '--upload',
@@ -892,6 +895,12 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
             hint['ram'] = 8000 # MB
         elif self.args.simultaneous_jobs >= 10:
             hint['ram'] = 4000 # MB
+        if self.args.controller_cpus > 0:
+            hint['cpus'] = self.args.controller_cpus
+        if self.args.controller_ram > 0:
+            hint['ram'] = self.args.controller_ram
+        if self.args.controller_disk > 0:
+            hint['disk'] = self.args.controller_disk
 
         select = None
         if self.get_provider() == 'ovh':