diff --git a/software/cloudooo/instance.cfg.in b/software/cloudooo/instance.cfg.in index eef42a5ad737bf7eb95c247c718e59458736714b..a57a2899b0368e9043bdeef2e6f8cfc214e578e9 100644 --- a/software/cloudooo/instance.cfg.in +++ b/software/cloudooo/instance.cfg.in @@ -6,14 +6,6 @@ eggs-directory = {{ eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }} offline = true -[slap-parameters] -recipe = slapos.cookbook:slapparameters -computer = ${slap-connection:computer-id} -partition = ${slap-connection:partition-id} -url = ${slap-connection:server-url} -key = ${slap-connection:key-file} -cert = ${slap-connection:cert-file} - [jinja2-template-base] recipe = slapos.recipe.template:jinja2 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename} @@ -21,7 +13,6 @@ extra-context = context = key eggs_directory buildout:eggs-directory key develop_eggs_directory buildout:develop-eggs-directory - jsonkey slapparameter_dict slap-parameters:json ${:extra-context} [dynamic-template-cloudooo-parameters] @@ -53,8 +44,6 @@ filename = instance-cloudoo.cfg extra-context = section parameter_dict dynamic-template-cloudooo-parameters import json_module json -# Must match the key id in [switch-softwaretype] which uses this section. - raw software_type default [switch-softwaretype] recipe = slapos.cookbook:softwaretype diff --git a/software/cloudooo/software.cfg b/software/cloudooo/software.cfg index c30da695ac479fed62c460d4230c597977d8528b..c4d60f9fd21041778afdab2b7be17c8f2dee2fca 100755 --- a/software/cloudooo/software.cfg +++ b/software/cloudooo/software.cfg @@ -68,7 +68,7 @@ context = # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = 5c4efb6deb981401d131eaf70a7c6f76 +md5sum = 843e8ab2bd35c585fa22eee4e83f4e6e extra-context = key buildout_bin_directory buildout:bin-directory key dcron_location dcron:location