recipe.generic_varnish: Allow passing backend-url as section parameter.

be50f997 · Vincent Pelletier · 4c78075f · be50f997
Commit be50f997 authored Jul 24, 2013 by Vincent Pelletier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

slapos/recipe/generic_varnish/__init__.py slapos/recipe/generic_varnish/__init__.py +5 -3

No files found.
--- 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.options.get('backend-url',
-      'backend-url',
+      # BBB: Peeking in partition parameters directly. Eew.
-      self.parameter_dict.get('tidstorage-url') # BBB
+      self.parameter_dict.get('backend-url',
+        self.parameter_dict.get('tidstorage-url') # BBB
+      )
    )
    backend_server, backend_port = self._getBackendServer(backend_url)
    path_list = []