From: gkyratsas <gkyratsas@suse.com>
Date: Wed, 24 Apr 2019 14:37:43 +0000 (+0200)
Subject: openstack: always pass branch and repo parameters
X-Git-Tag: 1.1.0~254^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1285%2Fhead;p=teuthology.git

openstack: always pass branch and repo parameters

We need to always pass the parameters below in order to make it work using
environment variables:
--ceph
--ceph-repo
--suite-repo
--suite-branch
--teuthology-branch

Signed-off-by: gkyratsas <gkyratsas@suse.com>

Conflicts:
	teuthology/openstack/__init__.py
---

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 1f2d598f7..1f006dedc 100644
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -714,12 +714,20 @@ class TeuthologyOpenStack(OpenStack):
         running the teuthology cluster.
         """
         original_argv = self.argv[:]
-        argv = []
+        argv = ['--ceph', self.args.ceph,
+                '--ceph-repo', self.args.ceph_repo,
+                '--suite-repo', self.args.suite_repo,
+                '--suite-branch', self.args.suite_branch,
+                ]
         while len(original_argv) > 0:
             if original_argv[0] in ('--name',
                                     '--teuthology-branch',
                                     '--teuthology-git-url',
                                     '--test-repo',
+                                    '--suite-repo',
+                                    '--suite-branch',
+                                    '--ceph-repo',
+                                    '--ceph',
                                     '--archive-upload',
                                     '--archive-upload-url',
                                     '--key-name',