Commit 16180362 authored by Vincent Pelletier's avatar Vincent Pelletier

varnish: Avoid using plural names.

Fixes "key ipv4_set slap-configuration:ipv4" referencing a non-existing
section (woops, copy/paste...).
parent 7179e81f
...@@ -6,7 +6,7 @@ eggs-directory = {{ eggs_directory }} ...@@ -6,7 +6,7 @@ eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
[slap-parameters] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id} computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id} partition = ${slap-connection:partition-id}
...@@ -21,7 +21,7 @@ extra-context = ...@@ -21,7 +21,7 @@ extra-context =
context = context =
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
key slapparameter_dict slap-parameters:configuration key slapparameter_dict slap-configuration:configuration
key ipv4_set slap-configuration:ipv4 key ipv4_set slap-configuration:ipv4
${:extra-context} ${:extra-context}
......
...@@ -71,7 +71,7 @@ context = ...@@ -71,7 +71,7 @@ context =
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 8b6296df7fc1e01820dd68ffe768694f md5sum = 8e906d749e19ee13fe5b7f4d9bfcf896
extra-context = extra-context =
key buildout_bin_directory buildout:bin-directory key buildout_bin_directory buildout:bin-directory
key dash_location dash:location key dash_location dash:location
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment