apache-frontend: frontend is now replicated by default

software/apache-frontend/common.cfg

@@ -51,21 +51,21 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 9c6346c8eaf484748e6be0b62b65cf2e
+md5sum = 5c22b1e0fe601255ebf19adf6093489f
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 7e7e7599ec41cf1eb6e8e725d855c345
+md5sum = 8ca00cbce7ea6b6817eb99564aa3172a
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
 [template-apache-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-md5sum = 2c96799f1429d0541c04c0875d864777
+md5sum = 02658d39fa429fef7faba9658e4f1474
 mode = 0644
 
 [template-slave-list]
@@ -83,6 +83,7 @@ mode = 640
 [template-replicate-publish-slave-information]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/replicate-publish-slave-information.cfg.in
+md5sum = 61a14dff06718e3d90c346a0a7b20c5a
 mode = 640
 
 [template-apache-frontend-configuration]

software/apache-frontend/instance-apache-frontend.cfg

@@ -59,9 +59,9 @@ squid-cache = $${:srv}/squid_cache
 
 [switch-apache-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = $${dynamic-default-template-slave-list:rendered}
-custom-personal = $${dynamic-custom-personal-template-slave-list:rendered}
-custom-group = $${dynamic-custom-group-template-slave-list:rendered}
+single-default = $${dynamic-default-template-slave-list:rendered}
+single-custom-personal = $${dynamic-custom-personal-template-slave-list:rendered}
+single-custom-group = $${dynamic-custom-group-template-slave-list:rendered}
 
 [instance-parameter]
 # Fetches parameters defined in SlapOS Master for this instance.
@@ -129,7 +129,7 @@ extra-context =
     raw empty_template ${template-empty:target}
     raw template_slave_configuration ${template-slave-configuration:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type custom-personal
+    raw software_type single-custom-personal
 
 [dynamic-custom-group-template-slave-list]
 < = jinja2-template-base
@@ -152,7 +152,7 @@ extra-context =
     key cache_port apache-configuration:cache-port
     raw empty_template ${template-empty:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type custom-group
+    raw software_type single-custom-group
 
 [dynamic-default-template-slave-list]
 < = jinja2-template-base
@@ -175,7 +175,7 @@ extra-context =
     raw template_slave_configuration ${template-default-slave-virtualhost:target}
     raw empty_template ${template-empty:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type default-RootSoftwareInstance
+    raw software_type single-default
 # XXXX Hack to allow two software types
 
 [dynamic-virtualhost-template-slave]

software/apache-frontend/instance-apache-replicate.cfg.in

-{% if slap_software_type.startswith(software_type) -%}
+{% if slap_software_type in software_type -%}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -13,18 +13,22 @@ context =
     ${:extra-context}
 
 {% set part_list = [] -%}
-{% set type_key = 'replicate-' %}
-{% set type_key_length = type_key | length %}
-{% if slap_software_type.startswith(type_key) %}
-{%   set frontend_type = slap_software_type[type_key_length:] -%}
+{% set single_type_key = 'single-' %}
+{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
+{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'single-default') -%}
 {% else -%}
-{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'default') -%}
+{%   set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
 {% endif -%}
-{% set frontend_quantity = slapparameter_dict.pop('-frontend-quantity', '2') | int -%}
+{% set frontend_quantity = slapparameter_dict.pop('-frontend-quantity', '1') | int -%}
 {% set slave_list_name = 'extra_slave_instance_list' -%}
 {% set frontend_list = [] %}
 {% set frontend_section_list = [] %}
 {% set namebase = 'apache-frontend' -%}
+# XXX Dirty hack, not possible to define default value before
+{% set sla_computer_apache_1_key = '-sla-1-computer_guid' -%}
+{% if not sla_computer_apache_1_key in slapparameter_dict -%}
+{%   do slapparameter_dict.__setitem__(sla_computer_apache_1_key, '${slap-connection:computer-id}') -%}
+{% endif -%}
 
 # Here we request individualy each frontend.
 # The presence of sla parameters is checked and added if found
@@ -81,6 +85,8 @@ slave-amount = {{ slave_instance_list | length }}
 recipe = slapos.cookbook:softwaretype
 default = ${dynamic-publish-slave-information:rendered}
 replicate = ${dynamic-publish-slave-information:rendered}
+custom-personal = ${dynamic-publish-slave-information:rendered}
+custom-group = ${dynamic-publish-slave-information:rendered}
 
 [slave-information]
 {% for frontend_section in frontend_section_list -%}
@@ -120,7 +126,6 @@ cert_file = ${slap-connection:cert-file}
 
 [slap-parameter]
 slave_instance_list =
--frontend-quantity = 2
--frontend-type = default
-
+-frontend-quantity = 1
+-frontend-type = single-default
 {%- endif %}

software/apache-frontend/instance.cfg

@@ -30,12 +30,12 @@ context =
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-apache-frontend:output}
-custom-personal = ${template-apache-frontend:output}
-custom-group = ${template-apache-frontend:output}
-replicate-default = $${dynamic-template-apache-replicate:rendered}
-replicate-custom-personal = $${dynamic-template-apache-replicate:rendered}
-replicate-custom-group = $${dynamic-template-apache-replicate:rendered}
+default = $${dynamic-template-apache-replicate:rendered}
+custom-personal = $${dynamic-template-apache-replicate:rendered}
+custom-group = $${dynamic-template-apache-replicate:rendered}
+single-default = ${template-apache-frontend:output}
+single-custom-personal = ${template-apache-frontend:output}
+single-custom-group = ${template-apache-frontend:output}
 replicate = $${dynamic-template-apache-replicate:rendered}
 
 [dynamic-template-apache-replicate]
@@ -46,4 +46,4 @@ extensions = jinja2.ext.do
 extra-context =
     raw template_publish_slave_information ${template-replicate-publish-slave-information:target}
 # Must match the key id in [switch-softwaretype] which uses this section.
-    raw software_type replicate
+    raw software_type RootSoftwareInstance-default-custom-personal-custom-group-replicate