openstack: switch to --{ceph,suite}-repo

--ceph-git-url and --ceph-qa-suite-git-url are now
arguments of teuthology-suite but were named --ceph-repo and
--suite-repo instead.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/scripts/openstack.py b/scripts/openstack.py
index 9995e864a5bf7d7eb7b16bd9f3f31f8a19465b94..fd4168db9c465cf73b45d7bcc6f4623318e17c9b 100644 (file)
--- a/scripts/openstack.py
+++ b/scripts/openstack.py
@@ -171,12 +171,12 @@ def get_suite_parser():
               'in branch')
     )
     parser.add_argument(
-        '--ceph-git-url',
-        help=("git clone url for Ceph"),
+        '--ceph-repo',
+        help=("Query this repository for Ceph branch and SHA1"),
     )
     parser.add_argument(
-        '--ceph-qa-suite-git-url',
-        help=("git clone url for ceph-qa-suite"),
+        '--suite-repo',
+        help=("Use tasks and suite definition in this repository"),
     )
     return parser
 

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 21f1b53b5349f929d6fa5a8201f4cbc31033b094..6d8c68d906bd3c4c79fd77a03b0746b294c61b01 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -624,9 +624,7 @@ class TeuthologyOpenStack(OpenStack):
                                     '--archive-upload-url',
                                     '--key-name',
                                     '--key-filename',
-                                    '--simultaneous-jobs',
-                                    '--ceph-git-url',
-                                    '--ceph-qa-suite-git-url'):
+                                    '--simultaneous-jobs'):
                 del original_argv[0:2]
             elif original_argv[0] in ('--teardown',
                                       '--upload'):
@@ -646,12 +644,13 @@ class TeuthologyOpenStack(OpenStack):
         if self.args.upload:
             argv.extend(['--archive-upload', self.args.archive_upload,
                          '--archive-upload-url', self.args.archive_upload_url])
-        for arg in ('ceph_git_url', 'ceph_qa_suite_git_url'):
+        for (arg, opt) in (('ceph_repo', 'ceph_git_url'),
+                           ('suite_repo', 'ceph_qa_suite_git_url')):
             if getattr(self.args, arg):
                 command = (
-                    "perl -pi -e 's|.*{arg}.*|{arg}: {value}|'"
+                    "perl -pi -e 's|.*{opt}.*|{opt}: {value}|'"
                     " ~/.teuthology.yaml"
-                ).format(arg=arg, value=getattr(self.args, arg))
+                ).format(opt=opt, value=getattr(self.args, arg))
                 self.ssh(command)
         argv.append('/home/' + self.username +
                     '/teuthology/teuthology/openstack/openstack.yaml')