qa/tasks/rgw: make the frontend_prefix per-client configurable.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index c87c422f0fb6e64c40349a6e7edf7705fd95cf74..31b00688823853463a780c251883becd4ed0b05d 100644 (file)
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -27,9 +27,9 @@ tasks:
           type: object-store
           description: Swift Service
 - rgw:
-    frontend_prefix: /swift
     client.0:
       valgrind: [--tool=memcheck]
+      frontend_prefix: /swift
       use-keystone-role: client.0
 - tempest:
     client.0:

diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
index 6d82610ff127f46637b86314a202e8cda028f4cb..2377d7f83e35abc29dc7408a595b4b9215265c6f 100644 (file)
--- a/qa/tasks/rgw.py
+++ b/qa/tasks/rgw.py
@@ -54,8 +54,9 @@ def start_rgw(ctx, config, clients):
         frontends = \
             '{frontend} port={port}'.format(frontend=ctx.rgw.frontend,
                                             port=port)
-        if ctx.rgw.frontend_prefix:
-            frontends += ' prefix={pfx}'.format(pfx=ctx.rgw.frontend_prefix)
+        frontend_prefix = client_config.get('frontend_prefix', None)
+        if frontend_prefix:
+            frontends += ' prefix={pfx}'.format(pfx=frontend_prefix)
         rgw_cmd.extend([
             '--rgw-frontends', frontends,
             '-n', client_with_id,
@@ -243,7 +244,6 @@ def task(ctx, config):
     ctx.rgw.erasure_code_profile = config.pop('erasure_code_profile', {})
     ctx.rgw.cache_pools = bool(config.pop('cache-pools', False))
     ctx.rgw.frontend = config.pop('frontend', 'civetweb')
-    ctx.rgw.frontend_prefix = config.pop('frontend_prefix', None)
     ctx.rgw.compression_type = config.pop('compression type', None)
     ctx.rgw.config = config