Jinja2-ify instance-memcached.cfg .

software/erp5/instance-memcached.cfg → software/erp5/instance-memcached.cfg.in

@@ -10,27 +10,27 @@ parts =
   memcached-instance
   publish-memcached-connection-information
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+services = ${rootdirectory:etc}/run
 
 [memcached-instance]
 recipe = slapos.cookbook:generic.memcached
-wrapper_path = $${basedirectory:services}/memcached
-binary_path = ${memcached:location}/bin/memcached
-shell-path = ${dash:location}/bin/dash
-ip = $${slap-network-information:local-ipv4}
+wrapper_path = ${basedirectory:services}/memcached
+binary_path = {{ memcached_location }}/bin/memcached
+shell-path = {{ dash_location }}/bin/dash
+ip = ${slap-network-information:local-ipv4}
 port = 11000
 
 [publish-memcached-connection-information]
 recipe = slapos.cookbook:publishurl
-url = memcached://$${memcached-instance:ip}:$${memcached-instance:port}/
+url = memcached://${memcached-instance:ip}:${memcached-instance:port}/

software/erp5/instance.cfg

@@ -27,7 +27,7 @@ recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-development:rendered}
 production = ${template-erp5-production:output}
 kumofs = ${template-kumofs:output}
-memcached = ${template-memcached:output}
+memcached = ${template-memcached:rendered}
 cloudooo = $${dynamic-template-cloudooo:output}
 zope = ${template-zope:output}
 mariadb = ${template-mariadb:output}

software/erp5/software.cfg

@@ -105,11 +105,12 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-memcached]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-memcached.cfg
-md5sum = 7ed1d93dafa76adc025acb2f0e08c05f
-output = ${buildout:directory}/template-memcached.cfg
-mode = 0644
+< = template-jinja2-base
+filename = instance-memcached.cfg
+md5sum = 395779dc578e2527cb0d89c5aee39f65
+extra-context =
+    key dash_location dash:location
+    key memcached_location memcached:location
 
 [template-erp5-development]
 < = template-jinja2-base