Commit 9d768e8f authored by Julien Muchembled's avatar Julien Muchembled

request: drop redundant 'config' & 'sla' options

parent 31d2714e
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.90' version = '0.91'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
# #
############################################################################## ##############################################################################
import logging import logging
from zc.buildout import UserError
from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
import json import json
from slapos import slap as slapmodule from slapos import slap as slapmodule
...@@ -33,12 +34,6 @@ import traceback ...@@ -33,12 +34,6 @@ import traceback
DEFAULT_SOFTWARE_TYPE = 'RootSoftwareInstance' DEFAULT_SOFTWARE_TYPE = 'RootSoftwareInstance'
def getListOption(option_dict, key, default=()):
result = option_dict.get(key, default)
if isinstance(result, basestring):
result = result.split()
return result
class Recipe(object): class Recipe(object):
""" """
Request a partition to a slap master. Request a partition to a slap master.
...@@ -104,19 +99,20 @@ class Recipe(object): ...@@ -104,19 +99,20 @@ class Recipe(object):
self.logger = logging.getLogger(name) self.logger = logging.getLogger(name)
software_url = options['software-url'] software_url = options['software-url']
name = options['name'] name = options['name']
return_parameters = getListOption(options, 'return') return_parameters = options.get('return', '').split()
if not return_parameters: if not return_parameters:
self.logger.debug("No parameter to return to main instance." self.logger.debug("No parameter to return to main instance."
"Be careful about that...") "Be careful about that...")
software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE) software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE)
filter_kw = dict( if 'config' in options or 'sla' in options:
(x, options['sla-' + x]) for x in getListOption(options, 'sla') raise UserError("'config' & 'sla' options are obsolete."
if options['sla-' + x] " Clean up your software release.")
) filter_kw = {k: v
partition_parameter_kw = self._filterForStorage(dict( for k, v in options.iteritems()
(x, options['config-' + x]) if k.startswith('sla-') and v}
for x in getListOption(options, 'config') partition_parameter_kw = self._filterForStorage({k: v
)) for k, v in options.iteritems()
if k.startswith('config-')})
slave = options.get('slave', 'false').lower() in \ slave = options.get('slave', 'false').lower() in \
librecipe.GenericBaseRecipe.TRUE_VALUES librecipe.GenericBaseRecipe.TRUE_VALUES
...@@ -267,7 +263,6 @@ class RequestEdge(Recipe): ...@@ -267,7 +263,6 @@ class RequestEdge(Recipe):
# Request will have its own copy of options dict # Request will have its own copy of options dict
local_options = original_options.copy() local_options = original_options.copy()
local_options['name'] = '%s-%s' % (country, name) local_options['name'] = '%s-%s' % (country, name)
local_options['sla'] = "region"
local_options['sla-region'] = country local_options['sla-region'] = country
self.request_dict[country] = Recipe(buildout, name, local_options) self.request_dict[country] = Recipe(buildout, name, local_options)
......
...@@ -177,7 +177,6 @@ name = MariaDB ...@@ -177,7 +177,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = mariadb software-type = mariadb
return = url return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id} sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse] [mariadb-urlparse]
...@@ -260,7 +259,6 @@ name = Frontend-Website ...@@ -260,7 +259,6 @@ name = Frontend-Website
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url} software-url = $${slap-parameter:frontend-software-url}
slave = true slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
...@@ -272,7 +270,6 @@ name = Frontend-FileManager ...@@ -272,7 +270,6 @@ name = Frontend-FileManager
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url} software-url = $${slap-parameter:frontend-software-url}
slave = true slave = true
config = url custom_domain
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/ config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain2} config-custom_domain = $${slap-parameter:domain2}
...@@ -284,7 +281,6 @@ name = Frontend-Website2 ...@@ -284,7 +281,6 @@ name = Frontend-Website2
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url} software-url = $${slap-parameter:frontend-software-url}
slave = true slave = true
config = url custom_domain
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/ config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain3} config-custom_domain = $${slap-parameter:domain3}
......
...@@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905 ...@@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apachephp.cfg url = ${:_profile_base_location_}/instance-apachephp.cfg
output = ${buildout:directory}/template-apachephp.cfg output = ${buildout:directory}/template-apachephp.cfg
md5sum = ef5c61127a21c016014021477d1791e3 md5sum = 8be713bd2656e184651c8ec10579d668
mode = 0644 mode = 0644
[instance-mariadb] [instance-mariadb]
......
...@@ -74,7 +74,7 @@ mode = 0644 ...@@ -74,7 +74,7 @@ mode = 0644
[template-apache-replicate] [template-apache-replicate]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
md5sum = 140b3be4ce46aa18b33aea5d379d90e9 md5sum = aafa98333cd51025938b33c2516f0b8d
mode = 0644 mode = 0644
[template-slave-list] [template-slave-list]
......
...@@ -86,7 +86,6 @@ software-url = ${slap-connection:software-release-url} ...@@ -86,7 +86,6 @@ software-url = ${slap-connection:software-release-url}
{% endif %} {% endif %}
software-type = {{frontend_type}} software-type = {{frontend_type}}
return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
config = _
connection-monitor_url = connection-monitor_url =
{% for section, frontend_request in request_dict.iteritems() %} {% for section, frontend_request in request_dict.iteritems() %}
...@@ -102,7 +101,6 @@ state = {{ frontend_request.get('state') }} ...@@ -102,7 +101,6 @@ state = {{ frontend_request.get('state') }}
{% do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %} {% do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
config-_ = {{ json_module.dumps(slave_configuration_dict) }} config-_ = {{ json_module.dumps(slave_configuration_dict) }}
{% if frontend_request.get('sla') %} {% if frontend_request.get('sla') %}
sla = {{ ' '.join(frontend_request.get('sla').keys()) }}
{% for parameter, value in frontend_request.get('sla').iteritems() -%} {% for parameter, value in frontend_request.get('sla').iteritems() -%}
sla-{{ parameter }} = {{ value }} sla-{{ parameter }} = {{ value }}
{% endfor -%} {% endfor -%}
......
...@@ -44,6 +44,6 @@ mode = 0644 ...@@ -44,6 +44,6 @@ mode = 0644
[instance-davstorage] [instance-davstorage]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum = 699ecf4678386667f58a3391bab7af0f md5sum = b83b0351a0f46aac35d52e681270ff03
output = ${buildout:directory}/template-davstorage.cfg output = ${buildout:directory}/template-davstorage.cfg
mode = 0644 mode = 0644
...@@ -166,7 +166,6 @@ name = Frontend Ajax ...@@ -166,7 +166,6 @@ name = Frontend Ajax
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url https-only
config-https-only = true config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/ config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
return = domain return = domain
...@@ -178,7 +177,6 @@ name = Frontend Webdav ...@@ -178,7 +177,6 @@ name = Frontend Webdav
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url https-only
config-https-only = true config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/ config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
return = domain return = domain
......
...@@ -58,7 +58,7 @@ mode = 0644 ...@@ -58,7 +58,7 @@ mode = 0644
[instance-etherpad-lite] [instance-etherpad-lite]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-etherpad-lite.cfg url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
md5sum = fd7249be8988155110234c7bb877abb9 md5sum = 28710a9a23320dd472387d81a698d12d
output = ${buildout:directory}/template-etherpad-lite.cfg output = ${buildout:directory}/template-etherpad-lite.cfg
mode = 0644 mode = 0644
......
...@@ -67,7 +67,6 @@ name = Frontend ...@@ -67,7 +67,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port} config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
return = site_url return = site_url
......
...@@ -92,7 +92,7 @@ mode = 0644 ...@@ -92,7 +92,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644 mode = 644
md5sum = e16c15f72fdeb92ce1854bc25daf5ad7 md5sum = ac69266206830226185e576fb6e4935a
download-only = true download-only = true
on-update = true on-update = true
...@@ -107,7 +107,7 @@ on-update = true ...@@ -107,7 +107,7 @@ on-update = true
[template-kvm-resilient-test] [template-kvm-resilient-test]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2 url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
md5sum = b4894680283d3912df4e9740f3e7848b md5sum = 080b5790b95a979e44c4a8e26dc02835
mode = 0644 mode = 0644
download-only = true download-only = true
on-update = true on-update = true
......
...@@ -42,16 +42,13 @@ recipe = slapos.cookbook:request ...@@ -42,16 +42,13 @@ recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
software-type = kvm-resilient software-type = kvm-resilient
name = Resilient KVM (Root Instance) name = Resilient KVM (Root Instance)
{% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%} {% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
config = virtual-hard-drive-url virtual-hard-drive-md5sum resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join(' ') }}
{% for key, value in cluster_parameter_dict.items() -%}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor -%}
config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url} config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum} config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-resiliency-backup-periodicity = */5 * * * * config-resiliency-backup-periodicity = */5 * * * *
# XXX What to do? # XXX What to do?
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id} sla-computer_guid = ${slap-connection:computer-id}
[slap-parameter] [slap-parameter]
......
...@@ -196,11 +196,9 @@ partition-id = ${slap-connection:partition-id} ...@@ -196,11 +196,9 @@ partition-id = ${slap-connection:partition-id}
name = VNC Frontend name = VNC Frontend
software-type = ${slap-parameter:frontend-software-type} software-type = ${slap-parameter:frontend-software-type}
slave = true slave = true
config = host port
config-host = ${novnc-instance:ip} config-host = ${novnc-instance:ip}
config-port = ${novnc-instance:port} config-port = ${novnc-instance:port}
return = url resource port domainname return = url resource port domainname
sla = instance_guid
sla-instance_guid = ${slap-parameter:frontend-instance-guid} sla-instance_guid = ${slap-parameter:frontend-instance-guid}
[frontend-promise] [frontend-promise]
......
...@@ -71,7 +71,6 @@ name = Monitor Frontend ...@@ -71,7 +71,6 @@ name = Monitor Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url domain
config-url = $${monitor-parameters:url} config-url = $${monitor-parameters:url}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
return = site_url domain return = site_url domain
......
...@@ -15,7 +15,7 @@ parts = ...@@ -15,7 +15,7 @@ parts =
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
md5sum = 6ad84a0061df0c00a9f41d8b302adc45 md5sum = b86685e4007296f4808c2f1f1b74a290
mode = 0644 mode = 0644
# stupify index for now # stupify index for now
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
[request-common] [request-common]
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id} sla-computer_guid = ${slap-connection:computer-id}
server-url = ${slap-connection:server-url} server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file} key-file = ${slap-connection:key-file}
...@@ -17,22 +16,15 @@ cert-file = ${slap-connection:cert-file} ...@@ -17,22 +16,15 @@ cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id} computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id} partition-id = ${slap-connection:partition-id}
config-cluster = {{ slapparameter_dict['cluster'] }} config-cluster = {{ slapparameter_dict['cluster'] }}
config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
[request-config]
base = cluster
master = partitions replicas
node = masters
[node-base] [node-base]
< = request-common < = request-common
config = ${request-config:base} ${request-config:node}
config-masters = ${all-masters:addresses} config-masters = ${all-masters:addresses}
[mysql-storage-base] [mysql-storage-base]
< = request-common < = request-common
config = ${request-config:base} ${request-config:master} config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
software-type = {{ mysql_storage_software_type }} software-type = {{ mysql_storage_software_type }}
[mysql-storage-request-base] [mysql-storage-request-base]
...@@ -61,7 +53,6 @@ name = {{ section_id }} ...@@ -61,7 +53,6 @@ name = {{ section_id }}
< = mysql-storage-base < = mysql-storage-base
node-base node-base
name = {{ section_id }} name = {{ section_id }}
config = ${request-config:base} ${request-config:master} ${request-config:node}
{% endfor -%} {% endfor -%}
{% for node_number in range(slapparameter_dict.get('admin-count', 1)) -%} {% for node_number in range(slapparameter_dict.get('admin-count', 1)) -%}
......
...@@ -65,7 +65,7 @@ md5sum = 987f69333c563898cab21455509f8024 ...@@ -65,7 +65,7 @@ md5sum = 987f69333c563898cab21455509f8024
[template-cluster] [template-cluster]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/cluster.cfg.in url = ${:_profile_base_location_}/cluster.cfg.in
md5sum = 7177d129e171b20044bf435ed549af43 md5sum = edd46f8670421520ef20c786cd65d8c1
[template-instance] [template-instance]
< = base-template < = base-template
......
...@@ -64,12 +64,9 @@ state = {{ slapparameter_dict.pop(state_key) }} ...@@ -64,12 +64,9 @@ state = {{ slapparameter_dict.pop(state_key) }}
{% endif%} {% endif%}
config-zone = {{ zone }} config-zone = {{ zone }}
config-soa = {{ "%s,%s" % (dns_domain, server_admin) }} config-soa = {{ "%s,%s" % (dns_domain, server_admin) }}
{% if sla_parameters %}
sla = {{ ' '.join(sla_parameters) }}
{% for parameter in sla_parameters -%} {% for parameter in sla_parameters -%}
sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }} sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
{% endfor -%} {% endfor -%}
{% endif -%}
{% endfor -%} {% endfor -%}
...@@ -86,7 +83,6 @@ software-url = ${slap-connection:software-release-url} ...@@ -86,7 +83,6 @@ software-url = ${slap-connection:software-release-url}
{% endif %} {% endif %}
software-type = {{dns_type}} software-type = {{dns_type}}
return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
config = {{ ' '.join(slapparameter_dict.keys()) + ' zone soa server-admin ns-record ' + slave_list_name }}
config-server-admin = {{ server_admin }} config-server-admin = {{ server_admin }}
config-ns-record = {{ ns_record }} config-ns-record = {{ ns_record }}
{% for parameter, value in slapparameter_dict.iteritems() -%} {% for parameter, value in slapparameter_dict.iteritems() -%}
......
...@@ -38,7 +38,7 @@ mode = 640 ...@@ -38,7 +38,7 @@ mode = 640
[template-dns-replicate] [template-dns-replicate]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2 url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
md5sum = 7cfc55bfb9821aad44272153f60450ef md5sum = 83cedc8fa923c59ca900b4600cc1c52f
mode = 0644 mode = 0644
[iso-list] [iso-list]
......
...@@ -46,7 +46,7 @@ mode = 0644 ...@@ -46,7 +46,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = 8a6688ed89f49d32312f2145b7f7d15e md5sum = 8ebc0e59db33f0105968a813a3130236
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
...@@ -90,7 +90,7 @@ mode = 0644 ...@@ -90,7 +90,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
download-only = true download-only = true
md5sum = 01545742e97b4b95cd5e14d5d7cb1584 md5sum = 105c7c427def7b2643b7480b2bada3a5
filename = instance-resilient-test.cfg.jinja2 filename = instance-resilient-test.cfg.jinja2
mode = 0644 mode = 0644
......
...@@ -41,9 +41,7 @@ recipe = slapos.cookbook:request ...@@ -41,9 +41,7 @@ recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
software-type = resilient software-type = resilient
name = Resilient Instance (Root Instance) name = Resilient Instance (Root Instance)
{% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%} {% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
config = resiliency-backup-periodicity resilient-clone-number {{ cluster_parameter_dict.keys() | join(' ') }}
{% for key, value in cluster_parameter_dict.items() -%}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor -%}
config-resiliency-backup-periodicity = */6 * * * * config-resiliency-backup-periodicity = */6 * * * *
...@@ -51,7 +49,6 @@ config-resilient-clone-number = 2 ...@@ -51,7 +49,6 @@ config-resilient-clone-number = 2
# XXX hardcoded # XXX hardcoded
#config-frontend-domain = google.com #config-frontend-domain = google.com
# XXX Hack to deploy Root Instance on the same computer as the type-test Instance # XXX Hack to deploy Root Instance on the same computer as the type-test Instance
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id} sla-computer_guid = ${slap-connection:computer-id}
return = backend_url return = backend_url
......
...@@ -78,16 +78,12 @@ computer-id = $${slap-connection:computer-id} ...@@ -78,16 +78,12 @@ computer-id = $${slap-connection:computer-id}
partition-id = $${slap-connection:partition-id} partition-id = $${slap-connection:partition-id}
{%- if slapparameter_dict.get('custom-frontend-instance-guid') -%} {%- if slapparameter_dict.get('custom-frontend-instance-guid') -%}
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid} sla-instance_guid = $${slap-parameter:frontend-instance-guid}
{% endif -%} {% endif -%}
{% set custom_frontend_backend_type = slapparameter_dict.get('custom-frontend-backend-type')%} {% set custom_frontend_backend_type = slapparameter_dict.get('custom-frontend-backend-type') -%}
{% if custom_frontend_backend_type %} {% if custom_frontend_backend_type -%}
config = url type
config-type = {{ custom_frontend_backend_type }} config-type = {{ custom_frontend_backend_type }}
{% else %}
config = url
{% endif -%} {% endif -%}
config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }} config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }}
return = site_url domain return = site_url domain
...@@ -422,7 +418,6 @@ name = SlapRunner Frontend ...@@ -422,7 +418,6 @@ name = SlapRunner Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url domain
config-url = $${slaprunner:access-url} config-url = $${slaprunner:access-url}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
return = site_url domain return = site_url domain
...@@ -434,7 +429,6 @@ name = Monitor Frontend ...@@ -434,7 +429,6 @@ name = Monitor Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url domain
config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port} config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
return = site_url domain return = site_url domain
......
...@@ -40,7 +40,6 @@ name = Test Root Instance - Slave ...@@ -40,7 +40,6 @@ name = Test Root Instance - Slave
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = test software-type = test
slave = true slave = true
sla = instance_guid
sla-instance_guid = $${request-test-instance:instance-guid} sla-instance_guid = $${request-test-instance:instance-guid}
return = foo return = foo
......
...@@ -165,7 +165,6 @@ name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition ...@@ -165,7 +165,6 @@ name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url
config-url = http://[$${instance-parameter:ipv6-random}]:5000 config-url = http://[$${instance-parameter:ipv6-random}]:5000
return = site_url return = site_url
......
...@@ -151,7 +151,6 @@ name = Frontend ...@@ -151,7 +151,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
......
...@@ -20,7 +20,6 @@ return = url backend-url ...@@ -20,7 +20,6 @@ return = url backend-url
country-list = $${slap-parameter:country-list} country-list = $${slap-parameter:country-list}
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = default software-type = default
config = application-location
config-application-location = $${slap-parameter:application-location} config-application-location = $${slap-parameter:application-location}
return = backend-url return = backend-url
......
...@@ -13,7 +13,7 @@ md5sum = 26ac6629a83869140189a85e581e822f ...@@ -13,7 +13,7 @@ md5sum = 26ac6629a83869140189a85e581e822f
[instance-apache-php] [instance-apache-php]
url = ${:_profile_base_location_}/instance-apache-php.cfg.in url = ${:_profile_base_location_}/instance-apache-php.cfg.in
md5sum = fdc849c9f49b9d2fb043bf229d24076b md5sum = 062e77e6be6cda965cfdd0e6011df86e
[instance-edge] [instance-edge]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
...@@ -75,7 +75,6 @@ name = Postgres ...@@ -75,7 +75,6 @@ name = Postgres
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = postgres software-type = postgres
return = url return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id} sla-computer_guid = $${slap-connection:computer-id}
[postgres-urlparse] [postgres-urlparse]
...@@ -139,7 +138,6 @@ name = Frontend ...@@ -139,7 +138,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url
config-url = $${mioga-url:direct_url} config-url = $${mioga-url:direct_url}
return = site_url return = site_url
......
...@@ -181,7 +181,6 @@ name = MariaDB ...@@ -181,7 +181,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = mariadb software-type = mariadb
return = url return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id} sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse] [mariadb-urlparse]
...@@ -437,7 +436,6 @@ name = Frontend ...@@ -437,7 +436,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = http://[$${slap-network-information:global-ipv6}]:8080 config-url = http://[$${slap-network-information:global-ipv6}]:8080
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
......
...@@ -84,7 +84,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848 ...@@ -84,7 +84,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-trac.cfg url = ${:_profile_base_location_}/instance-trac.cfg
output = ${buildout:directory}/template-trac.cfg output = ${buildout:directory}/template-trac.cfg
md5sum = 1546a60e086b4d083d58ad4fca6dcca8 md5sum = 2dc7ebfa9b7d5117274b74bafed4cfd4
mode = 0644 mode = 0644
[instance-mariadb] [instance-mariadb]
......
...@@ -196,11 +196,9 @@ partition-id = $${slap-connection:partition-id} ...@@ -196,11 +196,9 @@ partition-id = $${slap-connection:partition-id}
name = VNC Frontend name = VNC Frontend
software-type = $${slap-parameter:frontend-software-type} software-type = $${slap-parameter:frontend-software-type}
slave = true slave = true
config = host port
config-host = $${novnc-instance:ip} config-host = $${novnc-instance:ip}
config-port = $${novnc-instance:port} config-port = $${novnc-instance:port}
return = url resource port domainname return = url resource port domainname
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid} sla-instance_guid = $${slap-parameter:frontend-instance-guid}
[request-web-frontend] [request-web-frontend]
...@@ -210,7 +208,6 @@ name = Web Frontend ...@@ -210,7 +208,6 @@ name = Web Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/ config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
...@@ -223,7 +220,6 @@ name = SMTP Frontend ...@@ -223,7 +220,6 @@ name = SMTP Frontend
#software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg #software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg
software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg
slave = true slave = true
config = smtp-upstream-host smtp-upstream-port
config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6} config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
config-smtp-upstream-port = $${tunnel-ipv6-kvm-smtp:port} config-smtp-upstream-port = $${tunnel-ipv6-kvm-smtp:port}
return = listening-ipv4 return = listening-ipv4
......
...@@ -34,7 +34,7 @@ eggs = ...@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg output = ${buildout:directory}/template-boinc.cfg
md5sum = 6642942dde15ab5195d8d8533690ef29 md5sum = 5eb6057311fb1f73a54b72a40ead47c2
mode = 0644 mode = 0644
#Template for deploying MySQL Database Server #Template for deploying MySQL Database Server
......
...@@ -302,7 +302,6 @@ name = Frontend ...@@ -302,7 +302,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
......
...@@ -165,7 +165,7 @@ extra-context = ...@@ -165,7 +165,7 @@ extra-context =
[template-zope] [template-zope]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-zope.cfg.in url = ${:_profile_base_location_}/instance-zope.cfg.in
md5sum = 23baedc096a3ee046d2efe2195e19b96 md5sum = ddf63b8dac634df63133c24f36df1050
mode = 640 mode = 640
[template-kumofs] [template-kumofs]
...@@ -282,13 +282,13 @@ extra-context = ...@@ -282,13 +282,13 @@ extra-context =
[template-erp5-single] [template-erp5-single]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-single.cfg.in url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
md5sum = 34fa05c62c56a224d5114d2c0571f9ca md5sum = ee5ce422b52d1325f301a684ffc0eea3
mode = 640 mode = 640
[template-erp5-cluster] [template-erp5-cluster]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
md5sum = fe6c0d579e68b974f7350e7627546c34 md5sum = 1fafb23019043c069bf6e43d61010a54
mode = 640 mode = 640
[template-varnish] [template-varnish]
......
...@@ -18,7 +18,6 @@ versions = versions ...@@ -18,7 +18,6 @@ versions = versions
[request-common] [request-common]
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
sla = computer_guid
return = url return = url
server-url = ${slap-connection:server-url} server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file} key-file = ${slap-connection:key-file}
...@@ -35,7 +34,6 @@ sla-computer_guid = ${slap-parameter:mariadb-computer-guid} ...@@ -35,7 +34,6 @@ sla-computer_guid = ${slap-parameter:mariadb-computer-guid}
[request-cloudooo] [request-cloudooo]
<=request-common <=request-common
name = Cloudooo name = Cloudooo
config = cloudooo-json
config-cloudooo-json = ${slap-parameter:cloudooo-json} config-cloudooo-json = ${slap-parameter:cloudooo-json}
software-type = cloudooo software-type = cloudooo
sla-computer_guid = ${slap-parameter:cloudooo-computer-guid} sla-computer_guid = ${slap-parameter:cloudooo-computer-guid}
...@@ -56,15 +54,6 @@ sla-computer_guid = ${slap-parameter:kumofs-computer-guid} ...@@ -56,15 +54,6 @@ sla-computer_guid = ${slap-parameter:kumofs-computer-guid}
<=request-common <=request-common
name = TidStorage name = TidStorage
return = url-login return = url-login
config =
json
mysql-url
memcached-url
cloudooo-url
kumofs-url
smtp-url
bt5
bt5-repository-url
config-json = ${slap-parameter:json} config-json = ${slap-parameter:json}
config-mysql-url = ${request-mariadb:connection-url} config-mysql-url = ${request-mariadb:connection-url}
config-memcached-url = ${request-memcached:connection-url} config-memcached-url = ${request-memcached:connection-url}
...@@ -79,7 +68,6 @@ sla-computer_guid = ${slap-parameter:tidstorage-computer-guid} ...@@ -79,7 +68,6 @@ sla-computer_guid = ${slap-parameter:tidstorage-computer-guid}
[request-varnish] [request-varnish]
<=request-common <=request-common
name = Varnish name = Varnish
config = tidstorage-url
config-tidstorage-url = ${request-tidstorage:connection-url-login} config-tidstorage-url = ${request-tidstorage:connection-url-login}
config-web-checker-mail-address = ${slap-parameter:web-checker-mail-address} config-web-checker-mail-address = ${slap-parameter:web-checker-mail-address}
config-web-checker-smtp-host = ${slap-parameter:web-checker-smtp-host} config-web-checker-smtp-host = ${slap-parameter:web-checker-smtp-host}
......
...@@ -91,7 +91,6 @@ bt5-repository-url = ${slap-parameter:bt5-repository-url} ...@@ -91,7 +91,6 @@ bt5-repository-url = ${slap-parameter:bt5-repository-url}
[request-common] [request-common]
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id} sla-computer_guid = ${slap-connection:computer-id}
return = url return = url
server-url = ${slap-connection:server-url} server-url = ${slap-connection:server-url}
...@@ -108,7 +107,6 @@ software-type = mariadb ...@@ -108,7 +107,6 @@ software-type = mariadb
[request-cloudooo] [request-cloudooo]
<=request-common <=request-common
name = Cloudooo name = Cloudooo
config = cloudooo-json
config-cloudooo-json = ${slap-parameter:cloudooo-json} config-cloudooo-json = ${slap-parameter:cloudooo-json}
software-type = cloudooo software-type = cloudooo
......
...@@ -25,7 +25,6 @@ versions = versions ...@@ -25,7 +25,6 @@ versions = versions
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = {{ slapparameter_dict['frontend-software-url'] }} software-url = {{ slapparameter_dict['frontend-software-url'] }}
software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }} software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }}
sla = instance_guid
sla-instance_guid = {{ slapparameter_dict['frontend-instance-guid'] }} sla-instance_guid = {{ slapparameter_dict['frontend-instance-guid'] }}
server-url = ${slap-connection:server-url} server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file} key-file = ${slap-connection:key-file}
...@@ -41,7 +40,6 @@ slave = true ...@@ -41,7 +40,6 @@ slave = true
{% if 'frontend-domain' in slapparameter_dict -%} {% if 'frontend-domain' in slapparameter_dict -%}
{% do config_dict.__setitem__('custom_domain', slapparameter_dict['frontend-domain']) -%} {% do config_dict.__setitem__('custom_domain', slapparameter_dict['frontend-domain']) -%}
{% endif -%} {% endif -%}
config = {{ config_dict.keys() | join(' ') }}
{% for name, value in config_dict.items() -%} {% for name, value in config_dict.items() -%}
config-{{ name }} = {{ value }} config-{{ name }} = {{ value }}
{% endfor -%} {% endfor -%}
......
...@@ -179,7 +179,6 @@ name = MariaDB ...@@ -179,7 +179,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = mariadb software-type = mariadb
return = url return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id} sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse] [mariadb-urlparse]
...@@ -250,7 +249,6 @@ name = Frontend ...@@ -250,7 +249,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/ config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
......
...@@ -74,7 +74,7 @@ mode = 0644 ...@@ -74,7 +74,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg output = ${buildout:directory}/instance-apache-php.cfg
md5sum = 3e2d71d3684aac3e52d2f55794df96bf md5sum = b2564a719fdde097f402ef80e0991903
mode = 0644 mode = 0644
[instance-apache-import] [instance-apache-import]
...@@ -112,7 +112,7 @@ context = key buildout buildout:bin-directory ...@@ -112,7 +112,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination import-list = file parts template-parts:destination
file replicated template-replicated:destination file replicated template-replicated:destination
md5sum = 1640ebe7f8ced607ce1ec93c4f6e5413 md5sum = 5e2f917b032e43af6a736532966ae1f0
mode = 0644 mode = 0644
[instance-mariadb] [instance-mariadb]
......
...@@ -19,7 +19,6 @@ parts += ...@@ -19,7 +19,6 @@ parts +=
[request-apache] [request-apache]
return = url ssh-public-key ssh-url notification-id ip url backend_url return = url ssh-public-key ssh-url notification-id ip url backend_url
# XXX: hardcoded values # XXX: hardcoded values
config = domain number authorized-key notify namebase mariadb1-computer-guid pbs-mariadb1-computer-guid mariadb2-computer-guid pbs-mariadb2-computer-guid mariadb3-computer-guid pbs-mariadb3-computer-guid
config-mariadb1-computer-guid = ${slap-parameter:mariadb1-computer-guid} config-mariadb1-computer-guid = ${slap-parameter:mariadb1-computer-guid}
config-pbs-mariadb1-computer-guid = ${slap-parameter:pbs-mariadb1-computer-guid} config-pbs-mariadb1-computer-guid = ${slap-parameter:pbs-mariadb1-computer-guid}
config-mariadb2-computer-guid = ${slap-parameter:mariadb2-computer-guid} config-mariadb2-computer-guid = ${slap-parameter:mariadb2-computer-guid}
......
...@@ -179,7 +179,6 @@ name = Postgres ...@@ -179,7 +179,6 @@ name = Postgres
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = postgres software-type = postgres
return = url return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id} sla-computer_guid = $${slap-connection:computer-id}
[postgres-urlparse] [postgres-urlparse]
...@@ -235,7 +234,6 @@ name = Frontend ...@@ -235,7 +234,6 @@ name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
......
...@@ -62,7 +62,7 @@ mode = 0644 ...@@ -62,7 +62,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg output = ${buildout:directory}/instance-apache-php.cfg
md5sum = 823257dda6f3068a38c6b69c771cf307 md5sum = 7a0670c747f2f21a79c240bfbfbf9f6e
mode = 0644 mode = 0644
[instance-apache-import] [instance-apache-import]
...@@ -100,7 +100,7 @@ context = key buildout buildout:bin-directory ...@@ -100,7 +100,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination import-list = file parts template-parts:destination
file replicated template-replicated:destination file replicated template-replicated:destination
md5sum = 26da0631906c2267b82703c4d4f4a911 md5sum = 35bbf8cb40fe7185664641d82b406334
mode = 0644 mode = 0644
[instance-postgres] [instance-postgres]
......
...@@ -19,7 +19,6 @@ parts += ...@@ -19,7 +19,6 @@ parts +=
[request-apache] [request-apache]
return = url ssh-public-key ssh-url notification-id ip url backend_url return = url ssh-public-key ssh-url notification-id ip url backend_url
# XXX: hardcoded values # XXX: hardcoded values
config = domain number authorized-key notify namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid maarch-sql-data-file
config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid} config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid} config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid} config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid}
......
...@@ -69,7 +69,7 @@ mode = 0644 ...@@ -69,7 +69,7 @@ mode = 0644
[template-replicated] [template-replicated]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/template-replicated.cfg.in url = ${:_profile_base_location_}/template-replicated.cfg.in
md5sum = 649b4d898ecbcdca5135ad356788c7d3 md5sum = a21d751078dbf1fc80ecb93a6f499287
mode = 0644 mode = 0644
destination = ${buildout:directory}/template-replicated.cfg.in destination = ${buildout:directory}/template-replicated.cfg.in
...@@ -126,6 +126,6 @@ Jinja2 = 2.6 ...@@ -126,6 +126,6 @@ Jinja2 = 2.6
# ... And newer s.r.template requires Jinja2 >= 2.7 # ... And newer s.r.template requires Jinja2 >= 2.7
slapos.recipe.template = 2.4.2 slapos.recipe.template = 2.4.2
rdiff-backup = 1.3.4nxd2 rdiff-backup = 1.3.4nxd2
slapos.cookbook = 0.90 slapos.cookbook = 0.91
...@@ -31,13 +31,6 @@ software-url = ${slap-connection:software-release-url} ...@@ -31,13 +31,6 @@ software-url = ${slap-connection:software-release-url}
software-type = {{typeexport}} software-type = {{typeexport}}
name = {{namebase}}0 name = {{namebase}}0
return = ssh-public-key ssh-url notification-id ip return = ssh-public-key ssh-url notification-id ip
config =
# Resilient related parameters
number authorized-key notify namebase
{% if slapparameter_dict is defined %}
# Software Instance related parameters
{% for parameter_name in slapparameter_dict.keys() %}{{parameter_name}} {% endfor %}
{% endif %}
config-number = 0 config-number = 0
config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %} config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %} config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
...@@ -47,7 +40,6 @@ config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}} ...@@ -47,7 +40,6 @@ config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if sla_parameter_dict == {} -%} {% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network sla-mode = unique_by_network
{% else %} {% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, 0) -%} {% set sla_key_main = "-sla-%s%s-" % (namebase, 0) -%}
...@@ -62,13 +54,10 @@ sla-mode = unique_by_network ...@@ -62,13 +54,10 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%} {% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%} {% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }} sla-{{ key }} = {{ value }}
{% endfor -%} {% endfor -%}
{% endif -%} {% endif -%}
{% endif -%}
{% for id in range(1,nbbackup|int) %} {% for id in range(1,nbbackup|int) %}
...@@ -85,12 +74,10 @@ return = ssh-public-key ssh-url notification-url ip ...@@ -85,12 +74,10 @@ return = ssh-public-key ssh-url notification-url ip
pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
config = number authorized-key on-notification namebase
config-number = {{id}} config-number = {{id}}
config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key} config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id} config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
{% if sla_parameter_dict == {} -%} {% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network sla-mode = unique_by_network
{% else %} {% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, id) -%} {% set sla_key_main = "-sla-%s%s-" % (namebase, id) -%}
...@@ -105,13 +92,10 @@ sla-mode = unique_by_network ...@@ -105,13 +92,10 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%} {% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%} {% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }} sla-{{ key }} = {{ value }}
{% endfor -%} {% endfor -%}
{% endif %} {% endif %}
{% endif %}
[publish-connection-informations] [publish-connection-informations]
feed-url-{{namebase}}-{{id}}-push = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id} feed-url-{{namebase}}-{{id}}-push = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id}
...@@ -173,7 +157,6 @@ name = PBS ({{namebase}} / {{id}}) ...@@ -173,7 +157,6 @@ name = PBS ({{namebase}} / {{id}})
return = ssh-key notification-url feeds-url return = ssh-key notification-url feeds-url
slave = false slave = false
{% if sla_parameter_dict == {} -%} {% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network sla-mode = unique_by_network
{% else %} {% else %}
{% set sla_key_main = "-sla-%s%s-" % ("pbs", id) -%} {% set sla_key_main = "-sla-%s%s-" % ("pbs", id) -%}
...@@ -188,13 +171,10 @@ sla-mode = unique_by_network ...@@ -188,13 +171,10 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%} {% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%} {% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }} sla-{{ key }} = {{ value }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
[resilient-request-pbs-{{namebase}}-{{id}}-public-key-promise] [resilient-request-pbs-{{namebase}}-{{id}}-public-key-promise]
# Check that public-key-value parameter exists and is not empty # Check that public-key-value parameter exists and is not empty
...@@ -213,7 +193,6 @@ mode = 700 ...@@ -213,7 +193,6 @@ mode = 700
[request-pull-backup-server-{{namebase}}-{{id}}] [request-pull-backup-server-{{namebase}}-{{id}}]
<= request-pbs-common <= request-pbs-common
name = PBS {{id}} pulling from ${request-{{namebase}}:name} name = PBS {{id}} pulling from ${request-{{namebase}}:name}
config = url name type server-key on-notification notify notification-id title remove-backup-older-than
config-url = ${request-{{namebase}}:connection-ssh-url} config-url = ${request-{{namebase}}:connection-ssh-url}
config-type = pull config-type = pull
config-server-key = ${request-{{namebase}}:connection-ssh-public-key} config-server-key = ${request-{{namebase}}:connection-ssh-public-key}
...@@ -224,7 +203,6 @@ config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{n ...@@ -224,7 +203,6 @@ config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{n
config-title = Pulling from {{namebase}} config-title = Pulling from {{namebase}}
config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }} config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }}
slave = true slave = true
sla = instance_guid
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid} sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
[publish-connection-informations] [publish-connection-informations]
...@@ -234,7 +212,6 @@ feed-url-{{namebase}}-{{id}}-pull = ${request-pbs-{{namebase}}-{{id}}:connection ...@@ -234,7 +212,6 @@ feed-url-{{namebase}}-{{id}}-pull = ${request-pbs-{{namebase}}-{{id}}:connection
[request-pull-backup-server-{{namebase}}-backup-{{id}}] [request-pull-backup-server-{{namebase}}-backup-{{id}}]
<= request-pbs-common <= request-pbs-common
name = PBS pushing on ${request-{{namebase}}-pseudo-replicating-{{id}}:name} name = PBS pushing on ${request-{{namebase}}-pseudo-replicating-{{id}}:name}
config = url name type server-key on-notification notify notification-id title
config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-url} config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-url}
config-type = push config-type = push
config-server-key = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key} config-server-key = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}
...@@ -244,7 +221,6 @@ config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-no ...@@ -244,7 +221,6 @@ config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-no
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}} config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-title = Pushing to {{namebase}} backup {{id}} config-title = Pushing to {{namebase}} backup {{id}}
slave = true slave = true
sla = instance_guid
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid} sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
{% endfor %} {% endfor %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment