From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 9 Aug 2023 18:58:49 +0000 (-0400)
Subject: qa/rgw/tempest: override frontend_prefix in tempest task
X-Git-Tag: v18.2.5~53^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ffeaaae09ac63369c47ec8987c5bf0ab3f254a6;p=ceph.git

qa/rgw/tempest: override frontend_prefix in tempest task

tempest relies on `frontend_prefix: /swift` to serve the swift api from
the root path

s3tests relies on the same for s3. move the frontend_prefix
override into the tempest task so it doesn't apply to s3tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit c19aab4c31e89defca9409440463f4654b6cafd5)
---

diff --git a/qa/suites/rgw/tempest/0-install.yaml b/qa/suites/rgw/tempest/0-install.yaml
index d67cba6bc768..b6ef17de4ee2 100644
--- a/qa/suites/rgw/tempest/0-install.yaml
+++ b/qa/suites/rgw/tempest/0-install.yaml
@@ -11,5 +11,4 @@ tasks:
           description: Swift Service
 - rgw:
     client.0:
-      frontend_prefix: /swift
       use-keystone-role: client.0
diff --git a/qa/suites/rgw/tempest/tasks/+ b/qa/suites/rgw/tempest/tasks/+
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/rgw/tempest/tasks/tempest.yaml b/qa/suites/rgw/tempest/tasks/tempest.yaml
index 29017bc00cbc..cae0b3362ca1 100644
--- a/qa/suites/rgw/tempest/tasks/tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/tempest.yaml
@@ -1,3 +1,9 @@
+overrides:
+  rgw:
+    client.0:
+      # tempest tests expect the swift api at the root
+      frontend_prefix: /swift
+
 tasks:
 - tempest:
     client.0: