From: Zack Cerza <zack@cerza.org>
Date: Tue, 15 Apr 2014 22:02:33 +0000 (-0500)
Subject: Don't run apache functions if not using apache
X-Git-Tag: v0.94.10~27^2^2~364^2~248
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=761d76937d09e21073ccf56925c1028a8ca716b9;p=ceph.git

Don't run apache functions if not using apache

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 1f1058eef77d..ebff51a4e7e5 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -764,24 +764,45 @@ def task(ctx, config):
         del config['frontend']
     log.info("Using %s as radosgw frontend", ctx.rgw.frontend)
 
-    with contextutil.nested(
-        lambda: create_apache_dirs(ctx=ctx, config=config),
-        lambda: configure_regions_and_zones(
-            ctx=ctx,
-            config=config,
-            regions=regions,
-            role_endpoints=role_endpoints,
-            ),
-        lambda: configure_users(
-            ctx=ctx,
-            config=config,
-            everywhere=bool(regions),
-            ),
-        lambda: create_nonregion_pools(
-            ctx=ctx, config=config, regions=regions),
-        lambda: ship_apache_configs(ctx=ctx, config=config,
-                                    role_endpoints=role_endpoints),
-        lambda: start_rgw(ctx=ctx, config=config),
-        lambda: start_apache(ctx=ctx, config=config),
-            ):
-        yield
+    if ctx.rgw.frontend == 'apache':
+        with contextutil.nested(
+            lambda: create_apache_dirs(ctx=ctx, config=config),
+            lambda: configure_regions_and_zones(
+                ctx=ctx,
+                config=config,
+                regions=regions,
+                role_endpoints=role_endpoints,
+                ),
+            lambda: configure_users(
+                ctx=ctx,
+                config=config,
+                everywhere=bool(regions),
+                ),
+            lambda: create_nonregion_pools(
+                ctx=ctx, config=config, regions=regions),
+            lambda: ship_apache_configs(ctx=ctx, config=config,
+                                        role_endpoints=role_endpoints),
+            lambda: start_rgw(ctx=ctx, config=config),
+            lambda: start_apache(ctx=ctx, config=config),
+                ):
+            yield
+    elif ctx.rgw.frontend == 'civetweb':
+        with contextutil.nested(
+            lambda: configure_regions_and_zones(
+                ctx=ctx,
+                config=config,
+                regions=regions,
+                role_endpoints=role_endpoints,
+                ),
+            lambda: configure_users(
+                ctx=ctx,
+                config=config,
+                everywhere=bool(regions),
+                ),
+            lambda: create_nonregion_pools(
+                ctx=ctx, config=config, regions=regions),
+            lambda: start_rgw(ctx=ctx, config=config),
+                ):
+            yield
+    else:
+        raise ValueError("frontend must be 'apache' or 'civetweb'")