Commit 54ff69a8 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

default software_type is now 'default'

See merge request nexedi/slapos!1642
parent aa7e6b2f
......@@ -50,4 +50,4 @@ md5sum = 931038cfa23216af1628b960a2e10de6
[template]
filename = instance.cfg.in
md5sum = 974e21f30669e1b83e1e0cd8def0adc3
md5sum = 87bbe16a03003ae4071caa507b560cfe
......@@ -19,7 +19,7 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:pullrdiffbackup}
default = $${:pullrdiffbackup}
pullrdiffbackup = dynamic-template-pullrdiffbackup:output
[slap-configuration]
......
......@@ -15,11 +15,11 @@
[instance]
filename = instance.cfg.in
md5sum = ed2bd38b78f2a66f474205249f6e6f2c
md5sum = b38ba6283dc617e491cc594abb08551d
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
md5sum = 29c65611d51975e5bb2a1e2002a0a6c8
md5sum = 218b95ed1290be788b7c67908dfcdc12
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
......
......@@ -261,7 +261,6 @@ config-url = https://[${nginx-params:ip}]:${nginx-params:port}
config-websocket-path-list = ${nginx-params:websocket-path}
return = secure_access domain
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-type = RootSoftwareInstance
name = Beremiz VNC
......
......@@ -7,7 +7,6 @@ develop-eggs-directory = {{ buildout_develop_directory }}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = template-{{ instance_template_type }}:output
RootSoftwareInstance = ${:default}
test = template-beremiz-test:output
[slap-configuration]
......
......@@ -19,4 +19,4 @@ md5sum = 2e7c1d8c553b398dd68c875a9fa38cdb
[instance]
filename = instance.cfg.jinja2
md5sum = b4a50217c68233eb0e2922fd7606a6be
md5sum = d8dd5b68286c7ad38033866927a97d80
......@@ -32,5 +32,3 @@ import-list =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = caucased:output
# XXX: When will this name finally go away ?
RootSoftwareInstance = ${:default}
......@@ -14,7 +14,7 @@
# not need these here).
[template-cloudooo]
filename = instance.cfg.in
md5sum = d1e4d7306c39f2ebc64d0407860d4301
md5sum = 6f18a040f44d800dc43a8955f1f4f5b4
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
......
......@@ -44,4 +44,3 @@ extra-context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = cloudooo-dynamic-template:output
RootSoftwareInstance = ${:default}
......@@ -170,7 +170,7 @@
},
"software-type": {
"description": "Request a front-end slave instance of this software type.",
"default": "RootSoftwareInstance",
"default": "default",
"type": "string"
},
"virtualhostroot-http-port": {
......
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum = 06b0acece285ecbc0e746fa267a374b6
md5sum = e0737eb3d0ddcf017d7284a98cd6cde1
[template-default]
filename = instance-default.cfg.jinja.in
......
......@@ -16,7 +16,6 @@ cert = $${slap-connection:cert-file}
[switch_softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = instance-default:output
[instance-default]
......
......@@ -15,7 +15,7 @@
[template-erp5testnode]
filename = instance.cfg.in
md5sum = 681f4159e4ac2542d0fbc7a894e43d79
md5sum = 4cbd3b3b34267dea1016d951f46b8eb4
[template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
......
......@@ -3,7 +3,6 @@ extends = ${template:output}
[switch_softwaretype]
default = $${:test}
RootSoftwareInstance = $${:test}
# Used for the test of resiliency. The system wants a "test" software_type.
test = dynamic-template-resilient-test:output
......
......@@ -14,7 +14,7 @@
# not need these here).
[instance-profile]
filename = instance.cfg
md5sum = 1fe38a024766347454ad7a3d9fb52d01
md5sum = a88ac58fc22e804a176e4d43f917179e
[template-fluentd]
filename = instance-fluentd.cfg
......
......@@ -9,7 +9,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-fluentd:output
RootSoftwareInstance = $${:default}
[directory]
recipe = slapos.cookbook:mkdirectory
......
......@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum = 1747b8cda8d815055453420de4ed677f
md5sum = 0d6db8da45bbdf311f9c6a2f916045a2
[template-default]
filename = instance-default.cfg.in
......
......@@ -17,7 +17,6 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-default:output
RootSoftwareInstance = $${:default}
[dynamic-template-default]
recipe = slapos.recipe.template:jinja2
......
......@@ -14,7 +14,7 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
md5sum = 956ae53af22b551fbb087415e835868b
md5sum = 3ffdd78aeb77ab581c51ce419176dd37
[watcher]
_update_hash_filename_ = watcher.in
......
......@@ -15,7 +15,7 @@ offline = true
recipe = slapos.cookbook:switch-softwaretype
gitlab = instance-gitlab.cfg:output
gitlab-export = instance-gitlab-export.cfg:output
RootSoftwareInstance = $${:gitlab}
default = $${:gitlab}
# TODO -import, -pull-backup
......
[template-cfg]
filename = instance.cfg.in
md5sum = c6cdcee1e16dd4bd3bc462d286dcb999
md5sum = 25973164baf2304012beb37ecbc082cb
[instance-headless-chromium]
_update_hash_filename_ = instance-headless-chromium.cfg.in
......
......@@ -44,7 +44,6 @@ default-parameters =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = ${:default}
default = instance-headless-chromium:output
[slap-configuration]
......
......@@ -40,6 +40,4 @@ extra-context =
recipe = slapos.cookbook:switch-softwaretype
override = {{ dumps(override_switch_softwaretype |default) }}
default = root:output
# BBB
RootSoftwareInstance = ${:default}
server = server:output
......@@ -21,7 +21,7 @@ environment +=
[template]
recipe = slapos.recipe.template:jinja2
url = ${:_profile_base_location_}/instance.cfg.in
md5sum = 2e90443314d2036f7077898ab49bfec1
md5sum = 9d9edfa05d3a60297ae0e2ec8a6054ab
# XXX: "template.cfg" is hardcoded in instanciation recipe
output = ${buildout:directory}/template.cfg
context =
......
......@@ -26,7 +26,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = ${:default}
default = instance-html5as:output
[slap-configuration]
......
......@@ -27,7 +27,7 @@ recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/template.cfg
url = ${:_profile_base_location_}/${:filename}
filename = instance.cfg.in
md5sum = 861e7ce5d65252067d31c7325c97917d
md5sum = feadf0e0bee6d5b4182c2e016c6e183f
context =
section buildout buildout
key nginx_location nginx:location
......
......@@ -17,7 +17,7 @@
[template-cfg]
filename = instance.cfg.in
md5sum = 23c15a579b66cef866b30a2f53b1b737
md5sum = 2c21a4063087b6a24677dec61b08865d
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
......
......@@ -56,7 +56,6 @@ default-parameters =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = ${:default}
default = instance-html5as:output
replicate = instance-replicate:output
......
......@@ -26,4 +26,4 @@ md5sum = 3733c484371115831721341f9b65dc0f
[template]
filename = instance.cfg.in
md5sum = c86d4c6b5cc67139810399b1032c3410
md5sum = 1f337ae300eca111078015a6d61d5972
......@@ -17,7 +17,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:validator}
default = $${:validator}
validator = dynamic-template-validator:output
......
......@@ -22,7 +22,7 @@ md5sum = 01425a1c77e79788e1948398b9136724
[instance-profile]
filename = instance.cfg.in
md5sum = 4733c63573e6812c124b356dc146ffcc
md5sum = aa1d52767514868421fecd5bad073277
[instance-root]
filename = instance-root.cfg.jinja2
......
......@@ -8,7 +8,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = instance-root:output
[slap-configuration]
......
......@@ -15,7 +15,7 @@
[instance]
filename = instance.cfg.in
md5sum = 7333d1dfd4e8e4c375f7f1748292f554
md5sum = d9cf0d7b7db532106239cfef4ca19ac6
[template-jscrawler]
filename = instance-jscrawler.cfg.jinja2.in
......
......@@ -10,7 +10,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-jscrawler:output
RootSoftwareInstance = ${:default}
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
......
......@@ -15,11 +15,11 @@
[instance]
filename = instance.cfg.in
md5sum = 5f39952f94095b1f12f41db76867e71e
md5sum = f533ac0c5afd01244c25a0d8b26f6e20
[instance-jupyter]
filename = instance-jupyter.cfg.in
md5sum = 1812fa797b9eb687a634ebe96134b504
md5sum = b781ee4c01f3ce0520d70256743acb59
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
......
......@@ -12,7 +12,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
......@@ -30,7 +30,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
......
......@@ -42,11 +42,11 @@ logfile = ${directory:log}/jupyter_notebook.log
notebook_dir = ${directory:notebook_dir}
[slap-parameter]
frontend-software-type = RootSoftwareInstance
frontend-software-type = default
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-instance-guid =
frontend-instance-name = Jupyter Frontend
frontend-additional-software-type = RootSoftwareInstance
frontend-additional-software-type = default
frontend-additional-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-additional-instance-guid =
frontend-additional-instance-name = Jupyter Frontend Additional
......
......@@ -9,7 +9,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = slapos.cookbook:switch-softwaretype
default = $${:jupyter}
jupyter = instance-jupyter:output
RootSoftwareInstance = $${:default}
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
......
......@@ -33,7 +33,7 @@ See the instance-kvm-input-schema.json file for more instance parameters (cpu-co
KVM instance parameters:
~~~~~~~~~~~~~~~~~~~~~~~~~
- frontend-software-type (default: RootSoftwareInstance)
- frontend-software-type (default: default)
- frontend-software-url (default: http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg)
- frontend-instance-guid
- frontend-addtional-instance-guid
......
......@@ -15,15 +15,15 @@
[template]
filename = instance.cfg.in
md5sum = b6204319cca4264b3c351d4dd1f2b5d0
md5sum = ee1fe10d8db4d3c39e3a3f1b53d12883
[template-kvm]
filename = instance-kvm.cfg.jinja2
md5sum = 4ae98a072354efbdd7440d800cc675c8
md5sum = 9916c160b1c9711145d7e10506a9fca8
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = 15415f63741dc8c478512f9e410bb0ae
md5sum = 6e6f6748ec466eb49a4f872aec7563fa
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
......
......@@ -14,9 +14,9 @@
},
"frontend-software-type": {
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"RootSoftwareInstance\".",
"description": "Type of the frontend instance, like \"default\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
......@@ -32,9 +32,9 @@
},
"frontend-additional-software-type": {
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"RootSoftwareInstance\".",
"description": "Type of the frontend instance, like \"default\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
......
......@@ -7,7 +7,7 @@
{% set slave_frontend_stype = slave_frontend_dict.get('software-type', 'custom-personal') -%}
{% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
{% set WEBSOCKET_FRONTEND_DEFAULT_SR = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg' %}
{% set WEBSOCKET_FRONTEND_DEFAULT_ST = 'RootSoftwareInstance' %}
{% set WEBSOCKET_FRONTEND_DEFAULT_ST = 'default' %}
{% set kvm_instance_dict = {} -%}
{% set kvm_hostname_list = [] -%}
{% set monitor_base_url_dict = {} -%}
......
......@@ -285,7 +285,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
......@@ -303,7 +303,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
......
......@@ -1077,11 +1077,11 @@ log = ${directory:public}/ansible/vm-bootstrap.log
[slap-parameter]
# Default values if not specified
frontend-software-type = RootSoftwareInstance
frontend-software-type = default
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-instance-guid =
frontend-instance-name = VNC Real Frontend
frontend-additional-software-type = RootSoftwareInstance
frontend-additional-software-type = default
frontend-additional-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-additional-instance-guid =
frontend-additional-instance-name = VNC Real Frontend Additional
......
......@@ -21,9 +21,6 @@ kvm-export = dynamic-template-kvm-export:output
frozen = instance-frozen:output
pull-backup = template-pull-backup:output
# BBB
RootSoftwareInstance = $${:default}
# XXX - If this configuration is not generated by slapgrid, use empty values
[storage-configuration]
storage-home =
......
......@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum = 7ab3b606972e1b338d28fc1374617835
md5sum = 403a4a362b2ffec05f8d0b591bab92fa
[template-default]
_update_hash_filename_ = instance-default.cfg.in
......
......@@ -43,4 +43,3 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-default:output
RootSoftwareInstance = $${:default}
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum = cfb3bf67b11e5b1278d94f7e729d740c
md5sum = 7a218919e2601fd4b4e534dbce0703a6
[json-test-template]
_update_hash_filename_ = json-test-template.json.in.jinja2
......
......@@ -9,7 +9,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = slapos.cookbook:switch-softwaretype
default = instance-node-monitoring:output
edgetest-basic = instance-edgetest-basic:output
RootSoftwareInstance = $${:default}
[instance-template]
recipe = slapos.recipe.template:jinja2
......
......@@ -38,7 +38,7 @@ md5sum = 3ae93702f3890a504cc8a93eb5ad52bc
[template-neo]
filename = instance.cfg.in
md5sum = 78c46af020ebd0ff25a1b474a119695f
md5sum = ab0ad72d2df7ffe049921a7ca6725349
[cluster]
filename = cluster.cfg.in
......
......@@ -23,6 +23,4 @@ extra-context +=
recipe = slapos.cookbook:switch-softwaretype
override = {{ dumps(override_switch_softwaretype |default) }}
default = neo-cluster:output
# BBB
RootSoftwareInstance = ${:default}
neo = neo:output
......@@ -16,7 +16,7 @@
[template]
filename = instance.cfg
md5sum = f096f3cbb414730a9f0d46b0c0f5eb22
md5sum = 711d90973a5cfb2f61d3a3a53c07c64c
[template-ors]
filename = instance-ors.cfg
......
......@@ -132,10 +132,10 @@ init =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
# we don't select default software type to force user to choose the correct one
enb = dynamic-template-enb:output
core-network = dynamic-template-core-network:output
ue = dynamic-template-ue:output
RootSoftwareInstance = $${:core-network}
[dynamic-template-enb]
< = jinja2-template-base
......
......@@ -14,7 +14,7 @@
# not need these here).
[instance-profile]
filename = instance.cfg.in
md5sum = 145c7c84802ca0e3ee16ada31bde04b6
md5sum = 6bacd625936eed07a6025fd5be92614f
[instance-peertube]
_update_hash_filename_ = instance-peertube.cfg.in
......
......@@ -35,7 +35,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = peertube:output
[slap-configuration]
......
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum = 2f812f4814a0cc78a8b96d8014ac3104
md5sum = 6d9e7375732706593fabe2b3629dc699
[template-powerdns]
filename = instance-powerdns.cfg
......@@ -26,7 +26,7 @@ md5sum = 851353e1d4dd562ace58b3345c2da515
[template-dns-replicate]
_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
md5sum = f0a127e858f49beff4a5fcd2e71c088d
md5sum = 4e9d75ae82ccca107b0903033b2095f2
[iso-list]
_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
......
......@@ -15,7 +15,7 @@ context =
{% set part_list = [] -%}
{% set monitor_url_list = [] -%}
{% set single_type_key = 'single-' %}
{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
{% if slap_software_type in ("replicate", "default", "RootSoftwareInstance") %}
{% set dns_type = slapparameter_dict.pop('-dns-type', 'single-default') -%}
{% else -%}
{% set dns_type = "%s%s" % (single_type_key, slap_software_type) -%}
......
......@@ -12,9 +12,6 @@ recipe = slapos.cookbook:switch-softwaretype
default = dynamic-powerdns-replicate:output
single-default = dynamic-template-powerdns:output
# BBB
RootSoftwareInstance = $${:default}
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
output = $${buildout:directory}/$${:filename}
......@@ -44,6 +41,8 @@ filename = instance-powerdns-replicate.cfg
extensions = jinja2.ext.do
extra-context =
# Must match the key id in [switch-softwaretype] which uses this section.
# Keep RootSoftwareInstance for backward compatibility until we are sure all
# instances have software_type default
raw software_type RootSoftwareInstance-default
raw template_monitor ${monitor2-template:output}
......
......@@ -15,7 +15,7 @@
[instance-profile]
filename = instance.cfg.in
md5sum = 7f9749ab75475bd5d98be27a570c7731
md5sum = 8713d8a8d3f83bda2b6e825e9a4e5f56
[instance-default]
filename = instance-default.cfg.in
......
......@@ -34,5 +34,3 @@ recipe = slapos.cookbook:switch-softwaretype
# XXX Jerome: what is this override for ?
override = {{ dumps(override_switch_softwaretype |default) }}
default = instance-default:output
# BBB
RootSoftwareInstance = ${:default}
......@@ -239,7 +239,7 @@ redirected and accessible from the proxy::
instance = request(
software_release=rapid_cdn,
software_type="RootSoftwareInstance",
software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
......@@ -257,7 +257,7 @@ proxy::
instance = request(
software_release=rapid_cdn,
software_type="RootSoftwareInstance",
software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
......@@ -277,7 +277,7 @@ the proxy::
instance = request(
software_release=rapid_cdn,
software_type="RootSoftwareInstance",
software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
......@@ -296,7 +296,7 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be::
instance = request(
software_release=rapid_cdn,
software_type="RootSoftwareInstance",
software_type="default",
partition_reference='my frontend',
shared=True,
software_type="custom-personal",
......
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg.in
md5sum = bbeb179b698975c1a88ea7604df6740e
md5sum = 1714aa40cffc3b26b672e534ef90894b
[profile-common]
filename = instance-common.cfg.in
......@@ -22,11 +22,11 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
filename = instance-frontend.cfg.in
md5sum = af6c2d8dfa36c9012c6ef905689972ff
md5sum = 081aef1b071585e5f334a93d6d4969d0
[profile-master]
filename = instance-master.cfg.in
md5sum = 934b7f5e8d470e18bc980942bf467ada
md5sum = 5ded3544de312750d0ae06fdb3a436c9
[profile-slave-list]
filename = instance-slave-list.cfg.in
......
......@@ -185,7 +185,6 @@ slave-introspection-var = ${:var}/slave-introspection
[switch-frontend-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-custom-personal-profile-slave-list:output
RootSoftwareInstance = ${:default}
single-default = dynamic-custom-personal-profile-slave-list:output
single-custom-personal = dynamic-custom-personal-profile-slave-list:output
......
......@@ -509,7 +509,6 @@ config-url =
[publish-slave-information]
recipe = slapos.cookbook:switch-softwaretype
default = instance-publish-slave-information:output
RootSoftwareInstance = ${:default}
replicate = instance-publish-slave-information:output
custom-personal = instance-publish-slave-information:output
custom-group = instance-publish-slave-information:output
......
......@@ -26,7 +26,6 @@ import-list =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-profile-master:output
RootSoftwareInstance = ${:default}
custom-personal = dynamic-profile-master:output
single-default = dynamic-profile-frontend:output
single-custom-personal = dynamic-profile-frontend:output
......@@ -58,6 +57,8 @@ extra-context =
import validators validators
import software software
# Must match the key id in [switch-softwaretype] which uses this section.
# Keep RootSoftwareInstance for backward compatibility until all instances have
# changed their software_type to default
raw software_type RootSoftwareInstance-default-custom-personal-replicate
[dynamic-profile-kedifa]
......
......@@ -6940,7 +6940,7 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
'slap_computer_id': 'local',
'slap_computer_partition_id': 'T-0',
'slap_software_release_url': base_software_url,
'slap_software_type': 'RootSoftwareInstance',
'slap_software_type': 'default',
'slave_instance_list': []
}
}
......
......@@ -11,28 +11,28 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_enable-http2-default",
"slave_title": "_enable-http2-default"
},
{
"enable-http2": "false",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_enable-http2-false",
"slave_title": "_enable-http2-false"
},
{
"enable-http2": "true",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_enable-http2-true",
"slave_title": "_enable-http2-true"
},
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_dummy-cached",
"slave_title": "_dummy-cached",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -12,7 +12,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
......
......@@ -10,7 +10,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
......
......@@ -11,7 +11,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
......
......@@ -12,11 +12,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_default",
"slave_title": "_default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -15,11 +15,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_replicate",
"slave_title": "_replicate",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -12,11 +12,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_default_ciphers",
"slave_title": "_default_ciphers",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......@@ -24,7 +24,7 @@
{
"ciphers": "ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256",
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_own_ciphers",
"slave_title": "_own_ciphers",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -12,12 +12,12 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"health-check": true,
"health-check-http-method": "CONNECT",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-connect",
"slave_title": "_health-check-connect",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......@@ -31,20 +31,20 @@
"health-check-interval": "15",
"health-check-rise": "3",
"health-check-timeout": "7",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-custom",
"slave_title": "_health-check-custom",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"health-check": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-default",
"slave_title": "_health-check-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-disabled",
"slave_title": "_health-check-disabled",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......@@ -59,7 +59,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url",
"slave_title": "_health-check-failover-url",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
......@@ -74,7 +74,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url-auth-to-backend",
"slave_title": "_health-check-failover-url-auth-to-backend",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
......@@ -89,7 +89,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url-netloc-list",
"slave_title": "_health-check-failover-url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
......@@ -102,7 +102,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verified",
"health-check-interval": 1,
"health-check-timeout": 1,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verified",
"slave_title": "_health-check-failover-url-ssl-proxy-verified",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......@@ -114,7 +114,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verify-missing",
"health-check-interval": 1,
"health-check-timeout": 1,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verify-missing",
"slave_title": "_health-check-failover-url-ssl-proxy-verify-missing",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......@@ -127,7 +127,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verify-unverified",
"health-check-interval": 1,
"health-check-timeout": 1,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verify-unverified",
"slave_title": "_health-check-failover-url-ssl-proxy-verify-unverified",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -12,12 +12,12 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"custom_domain": "*.example.com",
"server-alias": "example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_01wildcard",
"slave_title": "_01wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/01wildcard"
......@@ -25,21 +25,21 @@
{
"custom_domain": "*.alias1.example.com",
"server-alias": "alias1.example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_02wildcard",
"slave_title": "_02wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/02wildcard"
},
{
"custom_domain": "zspecific.example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_03zspecific",
"slave_title": "_03zspecific",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/03zspecific"
},
{
"custom_domain": "zspecific.alias1.example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_04zspecific",
"slave_title": "_04zspecific",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/04zspecific"
......
......@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"custom_domain": "customdomainsslcrtsslkey.example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key",
"slave_title": "_custom_domain_ssl_crt_ssl_key",
"ssl_crt": "@@customdomain_certificate_pem@@",
......@@ -26,7 +26,7 @@
},
{
"custom_domain": "customdomainsslcrtsslkeysslcacrt.example.com",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"slave_title": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"ssl_ca_crt": "@@ca.certificate_pem@@",
......@@ -35,7 +35,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_does_not_match",
"slave_title": "_ssl_ca_crt_does_not_match",
"ssl_ca_crt": "@@ca.certificate_pem@@",
......@@ -44,7 +44,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_garbage",
"slave_title": "_ssl_ca_crt_garbage",
"ssl_ca_crt": "some garbage",
......@@ -54,19 +54,19 @@
},
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_master",
"slave_title": "_ssl_from_master",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_master_kedifa_overrides",
"slave_title": "_ssl_from_master_kedifa_overrides",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_slave",
"slave_title": "_ssl_from_slave",
"ssl_crt": "@@ssl_from_slave_certificate_pem@@",
......@@ -74,7 +74,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_slave_kedifa_overrides",
"slave_title": "_ssl_from_slave_kedifa_overrides",
"ssl_crt": "@@ssl_from_slave_kedifa_overrides_certificate_pem@@",
......@@ -82,21 +82,21 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_master",
"slave_title": "_type-notebook-ssl_from_master",
"type": "notebook",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_master_kedifa_overrides",
"slave_title": "_type-notebook-ssl_from_master_kedifa_overrides",
"type": "notebook",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_slave",
"slave_title": "_type-notebook-ssl_from_slave",
"ssl_crt": "@@type_notebook_ssl_from_slave_certificate_pem@@",
......@@ -105,7 +105,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_slave_kedifa_overrides",
"slave_title": "_type-notebook-ssl_from_slave_kedifa_overrides",
"ssl_crt": "@@type_notebook_ssl_from_slave_kedifa_overrides_certificate_pem@@",
......
......@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_master_kedifa_overrides_master_certificate",
"slave_title": "_ssl_from_master_kedifa_overrides_master_certificate",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
"slap_software_type": "RootSoftwareInstance",
"slap_software_type": "default",
"slave_reference": "_ssl_from_master",
"slave_title": "_ssl_from_master",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
......
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg.in
md5sum = 7be0c21751f8385ef876c3d7192d4057
md5sum = 57ddaa585f4755f8e8d1613e5321eefc
[template-re6stnet]
filename = instance-re6stnet.cfg.in
......
......@@ -47,5 +47,3 @@ recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-re6stnet:output
registry = ${:default}
# BBB
RootSoftwareInstance = ${:default}
......@@ -14,11 +14,11 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
md5sum = 55c7fd4dd6a39b31878889fbfb00f995
md5sum = 8daeb8d8743ca1b22e2c29e994e69df2
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum = c5a7a519270c7829bb4c987391fbfc39
md5sum = 51d53f5fff8c9918984578de0a7bca77
[config-toml.in]
_update_hash_filename_ = templates/config.toml.in
......
......@@ -327,7 +327,6 @@ config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
[{{ name}}-publish-slave-information]
recipe = slapos.cookbook:switch-softwaretype
default = {{ 'dynamic-' ~name ~ '-publish-slave-information:output' }}
RootSoftwareInstance = ${:default}
[dynamic-{{ name}}-publish-slave-information]
recipe = slapos.recipe.template:jinja2
......
......@@ -9,7 +9,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = template-instance-repman.cfg:output
RootSoftwareInstance = ${:default}
mariadb = template-instance-mariadb.cfg:output
......
......@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum = 10e19df182c692b71ea552da183a0bcf
md5sum = b443da6792bdde1218076a3a1ce50b11
[template-selenium]
filename = instance-selenium.cfg.in
......
......@@ -16,7 +16,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = dynamic-template-selenium:output
[slap-configuration]
......
......@@ -14,7 +14,7 @@
# not need these here).
[template-erp5]
filename = instance-erp5.cfg.in
md5sum = d0009cd600d341935679a7fb193f34d1
md5sum = cf5fbee0b5e104015eb9eac53ba2d241
[template-balancer]
filename = instance-balancer.cfg.in
......
......@@ -471,7 +471,7 @@ config-apachedex-configuration = {{
<= request-common
recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'default')) }}
{{ root_common.sla('frontend', True) }}
shared = true
{% set config_dict = {
......
......@@ -19,7 +19,7 @@ md5sum = 23b498618bce83a6eb8df0470417f59e
[instance]
_update_hash_filename_ = instance.cfg.in
md5sum = 9658a11340c018de816d0de40683706a
md5sum = 5aab12790cdb1981cb0caf00d389a227
[instance-import]
_update_hash_filename_ = instance-import.cfg.jinja.in
......
......@@ -52,7 +52,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
},
"additional-frontend-guid": {
"title": "Additional Frontend Instance ID",
......@@ -70,7 +70,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
"default": "RootSoftwareInstance"
"default": "default"
}
}
}
......
......@@ -18,7 +18,6 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = $${:theia}
theia = theia:output
export = export:output
......@@ -50,11 +49,11 @@ default-parameters =
"forward-slapos-frontend-requests": "enabled",
"frontend-name": "Theia Frontend",
"frontend-sr": "$${:frontend-sr}",
"frontend-sr-type": "RootSoftwareInstance",
"frontend-sr-type": "default",
"frontend-guid": null,
"additional-frontend-name":"Theia Additional Frontend",
"additional-frontend-sr": "$${:frontend-sr}",
"additional-frontend-sr-type": "RootSoftwareInstance",
"additional-frontend-sr-type": "default",
"additional-frontend-guid": null,
"monitor-httpd-port": 8386
}
......
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum = e70978c8b5d7ad6a98b5a12185236733
md5sum = 4d59e9687dd4261913e5b81d3c9a9871
[template-tsn-client]
filename = instance-tsn-client.cfg
......
......@@ -10,7 +10,6 @@ offline = true
recipe = slapos.cookbook:switch-softwaretype
default = tsn-client-dynamic-template:output
tsn-server = tsn-server-dynamic-template:output
RootSoftwareInstance = $${:default}
[dynamic-template-base]
recipe = slapos.recipe.template:jinja2
......
......@@ -15,7 +15,7 @@
[instance-cfg]
filename = instance.cfg.in
md5sum = f47adc5131a3096e916dbf9ef0061f50
md5sum = 31a25dff2777fe206bba92593dd725d6
[template-turnserver]
filename = instance-turnserver.cfg.jinja2.in
......
......@@ -8,7 +8,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:default}
default = dynamic-template-turnserver:output
insecure = dynamic-template-insecure-turnserver:output
......
......@@ -70,11 +70,11 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
[template]
filename = instance.cfg.in
md5sum = 3f7b28085ceff321a3cb785db60f7c3e
md5sum = 1a81908e9716dedba4f397f37264b015
[template-erp5]
filename = instance-erp5.cfg.in
md5sum = b056ec4fec956c2a07befd2fec116f04
md5sum = 6b10ab0c54278156caf058ebb7246645
[template-zeo]
filename = instance-zeo.cfg.in
......
......@@ -436,7 +436,7 @@ config-url = ${request-jupyter:connection-url}
<= request-common
recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'default')) }}
{{ root_common.sla('frontend', True) }}
shared = true
{% set config_dict = {
......
......@@ -229,8 +229,6 @@ override = {{ dumps(override_switch_softwaretype |default) }}
# Public software types
default = dynamic-template-erp5:output
# BBB
RootSoftwareInstance = ${:default}
# Internal software types
kumofs = dynamic-template-kumofs:output
caucase = dynamic-template-caucase:output
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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