Merge remote-tracking branch 'origin/master' into erp5-component

software/kvm/common.cfg

@@ -85,10 +85,24 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-kvm]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kvm.cfg.in
-md5sum = c06bb498593aabc9c76eb7dc892da15a 
-output = ${buildout:directory}/template-kvm.cfg
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
+md5sum = 03550e647e07af99dcd2af8f4869ecbe
+rendered = ${buildout:directory}/template-kvm.cfg
+output = ${:rendered}
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    raw curl_executable_location ${curl:location}/bin/curl
+    raw dash_executable_location ${dash:location}/bin/dash
+    raw dcron_executable_location ${dcron:location}/sbin/crond
+    raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
+    raw novnc_location ${noVNC:location}
+    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
+    raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
+    raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
+    raw websockify_executable_location ${buildout:directory}/bin/websockify
 mode = 0644
 
 [template-kvm-resilient]
@@ -125,7 +139,7 @@ mode = 0755
 [template-kvm-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.in
-md5sum = 2f5fdf1e88e6e3454f877b80074bed05 
+md5sum = 2f5fdf1e88e6e3454f877b80074bed05
 output = ${buildout:directory}/template-kvm-export.cfg
 mode = 0644
 
@@ -133,7 +147,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/kvm-export.sh.in
 filename = kvm-export.sh.in
-md5sum = 95fde96f35cbf90d677c44d18b60fafb 
+md5sum = 95fde96f35cbf90d677c44d18b60fafb
 download-only = true
 mode = 0755
 
@@ -151,3 +165,4 @@ md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
 
+

stack/resilient/buildout.cfg

@@ -68,7 +68,7 @@ mode = 0644
 [template-replicated]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
-md5sum = b70902e9f247ab710a26cedb2eae7559
+#md5sum = d2926c3dd292cb1d4fd99dd0e2211666
 mode = 0644
 destination = ${buildout:directory}/template-replicated.cfg.in
 

stack/resilient/template-replicated.cfg.in

@@ -51,7 +51,10 @@ config-ip-list =
 {% for parameter_name, parameter_value in slapparameter_dict.items() %}config-{{parameter_name}} = {{parameter_value}}
 {% endfor %}
 {% endif %}
-{% if sla_parameter_dict -%}
+{% if sla_parameter_dict == {} -%}
+sla = mode
+sla-mode = unique_by_network
+{% else %}
 {%   set sla_key_main = "-sla-%s%s-" % (namebase, 0) -%}
 {%   set sla_key_secondary = "-sla-%s-" % (0) -%}
 {%   set sla_key_main_length = sla_key_main | length -%}
@@ -72,7 +75,6 @@ sla-{{ key }} = {{ value }}
 {%   endif -%}
 {% endif -%}
 
-
 {% for id in range(1,nbbackup|int) %}
 
 [request-{{namebase}}-pseudo-replicating-{{id}}]
@@ -93,7 +95,10 @@ config-number = {{id}}
 config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
 config-ip-list =
-{% if sla_parameter_dict -%}
+{% if sla_parameter_dict == {} -%}
+sla = mode
+sla-mode = unique_by_network
+{% else %}
 {%   set sla_key_main = "-sla-%s%s-" % (namebase, id) -%}
 {%   set sla_key_secondary = "-sla-%s-" % (id) -%}
 {%   set sla_key_main_length = sla_key_main | length -%}
@@ -179,7 +184,10 @@ software-type = pull-backup
 name = PBS ({{namebase}} / {{id}})
 return = ssh-key notification-url feeds-url
 slave = false
-{% if sla_parameter_dict -%}
+{% if sla_parameter_dict == {} -%}
+sla = mode
+sla-mode = unique_by_network
+{% else %}
 {%   set sla_key_main = "-sla-%s%s-" % ("pbs", id) -%}
 {%   set sla_key_secondary = "-sla-%s-" % (id) -%}
 {%   set sla_key_main_length = sla_key_main | length -%}