From fedb99c50ff9766b4d204b78a454b781f4d1e540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Tue, 21 Aug 2012 17:36:36 +0200 Subject: [PATCH] Rename "development" software_type to "single" and "production" to "cluster". Kept backward compatibility about "production" software_type. --- stack/erp5/buildout.cfg | 14 +++++------ ...on.cfg.in => instance-erp5-cluster.cfg.in} | 0 ...ent.cfg.in => instance-erp5-single.cfg.in} | 0 stack/erp5/instance.cfg.in | 23 ++++++++++--------- 4 files changed, 19 insertions(+), 18 deletions(-) rename stack/erp5/{instance-erp5-production.cfg.in => instance-erp5-cluster.cfg.in} (100%) rename stack/erp5/{instance-erp5-development.cfg.in => instance-erp5-single.cfg.in} (100%) diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 8d5e0a20de..623890e07a 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -247,7 +247,7 @@ mode = 640 # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = 9704211fdbed6b23854dcc2222d387c4 +md5sum = 26d26c357053af48602b5110120bd085 extra-context = key apache_location apache:location key aspell_location aspell:location @@ -287,8 +287,8 @@ extra-context = key poppler_location poppler:location key sed_location sed:location key template_cloudooo template-cloudooo:target - key template_erp5_development template-erp5-development:target - key template_erp5_production template-erp5-production:rendered + key template_erp5_single template-erp5-single:target + key template_erp5_cluster template-erp5-cluster:rendered key template_kumofs template-kumofs:rendered key template_mariadb template-mariadb:rendered key template_memcached template-memcached:rendered @@ -311,15 +311,15 @@ extra-context = key dash_location dash:location key memcached_location memcached:location -[template-erp5-development] +[template-erp5-single] recipe = slapos.recipe.build:download -url = ${:_profile_base_location_}/instance-erp5-development.cfg.in +url = ${:_profile_base_location_}/instance-erp5-single.cfg.in md5sum = 2a4312202a3160f874c4fa3ee9155a1d mode = 640 -[template-erp5-production] +[template-erp5-cluster] < = template-jinja2-base -filename = instance-erp5-production.cfg +filename = instance-erp5-cluster.cfg md5sum = 3051f3fea39d7409c417dcac26027b56 extra-context = key local_bt5_repository local-bt5-repository:list diff --git a/stack/erp5/instance-erp5-production.cfg.in b/stack/erp5/instance-erp5-cluster.cfg.in similarity index 100% rename from stack/erp5/instance-erp5-production.cfg.in rename to stack/erp5/instance-erp5-cluster.cfg.in diff --git a/stack/erp5/instance-erp5-development.cfg.in b/stack/erp5/instance-erp5-single.cfg.in similarity index 100% rename from stack/erp5/instance-erp5-development.cfg.in rename to stack/erp5/instance-erp5-single.cfg.in diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index 492b2a3c7d..c056275c22 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -165,32 +165,33 @@ extra-context = key tesseract_location dynamic-template-zope-parameters:tesseract key w3m_location dynamic-template-zope-parameters:w3m -[template-erp5-development-parameters] +[template-erp5-single-parameters] bin-directory = {{ bin_directory }} openssl = {{ openssl_location }} local_bt5_repository = {{ local_bt5_repository }} dash = {{ dash_location }} curl = {{ curl_location }} -[template-erp5-development] +[template-erp5-single] < = jinja2-template-base -template = {{ template_erp5_development }} -filename = instance-erp5-development.cfg +template = {{ template_erp5_single }} +filename = instance-erp5-single.cfg # XXX: duplicates above section, so less is modified in template in this # commit. Should be replaced by a "section" line (preserving template_zope # definition). extra-context = - key bin_directory template-erp5-development-parameters:bin-directory - key openssl_location template-erp5-development-parameters:openssl - key curl_location template-erp5-development-parameters:curl - key dash_location template-erp5-development-parameters:dash + key bin_directory template-erp5-single-parameters:bin-directory + key openssl_location template-erp5-single-parameters:openssl + key curl_location template-erp5-single-parameters:curl + key dash_location template-erp5-single-parameters:dash key template_zope dynamic-template-zope:rendered - key local_bt5_repository template-erp5-development-parameters:local_bt5_repository + key local_bt5_repository template-erp5-single-parameters:local_bt5_repository [switch-softwaretype] recipe = slapos.cookbook:softwaretype -default = ${template-erp5-development:rendered} -production = {{ template_erp5_production }} +default = ${template-erp5-single:rendered} +production = {{ template_erp5_cluster }} +cluster = {{ template_erp5_cluster }} kumofs = {{ template_kumofs }} memcached = {{ template_memcached }} cloudooo = ${dynamic-template-cloudooo:rendered} -- 2.30.9