From be50f9971a366c83c9c9dcce20e30a0902a700df Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Wed, 24 Jul 2013 14:24:53 +0200 Subject: [PATCH] recipe.generic_varnish: Allow passing backend-url as section parameter. --- slapos/recipe/generic_varnish/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/slapos/recipe/generic_varnish/__init__.py b/slapos/recipe/generic_varnish/__init__.py index 678b4b5b3..0ccebc506 100644 --- a/slapos/recipe/generic_varnish/__init__.py +++ b/slapos/recipe/generic_varnish/__init__.py @@ -37,9 +37,11 @@ class Recipe(GenericSlapRecipe): """ def _install(self): ip = self.options['ip'] - backend_url = self.parameter_dict.get( - 'backend-url', - self.parameter_dict.get('tidstorage-url') # BBB + backend_url = self.options.get('backend-url', + # BBB: Peeking in partition parameters directly. Eew. + self.parameter_dict.get('backend-url', + self.parameter_dict.get('tidstorage-url') # BBB + ) ) backend_server, backend_port = self._getBackendServer(backend_url) path_list = [] -- 2.30.9