Update Release Candidate

slapos/recipe/librecipe/generic.py

@@ -169,7 +169,7 @@ class GenericBaseRecipe(object):
     # here (note that this can't be done correctly with a POSIX shell, because
     # the process can't be given a name).
 
-    lines = ['#!/bin/sh']
+    lines = ['#!/bin/sh -e']
 
     if sig_ign:
       lines.append("trap '' " + sig_ign)

software/beremiz-runtime/software.cfg

@@ -71,6 +71,8 @@ eggs = aiofiles
        cycler
        asyncua
        Twisted
+       fonttools
+       pycountry
 extra-paths = ${beremiz-source:location}
 
 [instance-profile]

software/rapidspace-vps/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 2a578c1dfea2b7ebe83bbacb052127c0
+md5sum = eb69f3c2a26948eb7e413a891589608d
 
 [software.json]
 filename = software.cfg.json
-md5sum = d40a0e467955be469645c517a3ca4881
+md5sum = 701a7f6e72c1effb2c9b3edacb971851
 
 [instance.json]
 filename = ../kvm/boot-image-input-schema.json

software/rapidspace-vps/instance.cfg.in

 [buildout]
+# Note that we don't extend instance.cfg.in from ../software/kvm because it
+# would bring all the resilient stuff that we don't need. The drawback is we
+# can't share all the template parameters.
 parts =
   switch_softwaretype
 
@@ -7,7 +10,10 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 [switch_softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
-default = dynamic-template-kvm:output
+default = dynamic-template-vps:output
+vpsbrute-4disks = dynamic-template-vpsbrute-4disks:output
+vpsbrute-6disks = dynamic-template-vpsbrute-6disks:output
+vpsbrute-10disks = dynamic-template-vpsbrute-10disks:output
 
 [slap-configuration]
 # we usejsonschema recipe in order to force some values for VPS (see all the const in the JSON schema)
@@ -25,23 +31,54 @@ init =
   conf = self.buildout['slap-configuration']['configuration']
   # we know for sure that there is only the boot-image parameters in conf
   # so only set what is custom compared to default values
+  ${slap-configuration-common:common-all}
   conf['ram-size'] = 245760
   conf['ram-max-size'] = 246272
-  conf['auto-ballooning'] = False
   conf['cpu-count'] = 40
   conf['cpu-max-count'] = 41
-  conf['wipe-disk-ondestroy'] = True
-  conf['use-tap'] = True
-  conf['frontend-software-type'] = "default"
-  conf['frontend-software-url'] = "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
-  conf['frontend-additional-software-type'] = "default"
-  conf['frontend-additional-software-url'] = "chinary-frontend-sr"
   conf['disk-device-path'] = "/dev/sdb"
   options['configuration'] = conf
   # XXX we should make sure this configuration matches KVM json schema...
 
+[slap-configuration-vpsbrute-4disks]
+# this section will force all constant values for VPSbrute 4 disks
+recipe  = slapos.recipe.build
+depends = $${slap-configuration:configuration}
+init =
+  conf = self.buildout['slap-configuration']['configuration']
+  ${slap-configuration-common:common-all}
+  ${slap-configuration-common:common-vpsbrute}
+  conf['disk-device-path'] = "/dev/nvme0n1 /dev/nvme1n1 /dev/nvme2n1 /dev/nvme3n1"
+  options['configuration'] = conf
+  # XXX we should make sure this configuration matches KVM json schema...
+
+[slap-configuration-vpsbrute-6disks]
+# this section will force all constant values for VPSbrute 4 disks
+recipe  = slapos.recipe.build
+depends = $${slap-configuration:configuration}
+init =
+  conf = self.buildout['slap-configuration']['configuration']
+  ${slap-configuration-common:common-all}
+  ${slap-configuration-common:common-vpsbrute}
+  conf['disk-device-path'] = "/dev/nvme0n1 /dev/nvme1n1 /dev/nvme2n1 /dev/nvme3n1 /dev/nvme4n1 /dev/nvme5n1"
+  options['configuration'] = conf
+  # XXX we should make sure this configuration matches KVM json schema...
+
+[slap-configuration-vpsbrute-10disks]
+# this section will force all constant values for VPSbrute 4 disks
+recipe  = slapos.recipe.build
+depends = $${slap-configuration:configuration}
+init =
+  conf = self.buildout['slap-configuration']['configuration']
+  ${slap-configuration-common:common-all}
+  ${slap-configuration-common:common-vpsbrute}
+  conf['disk-device-path'] = "/dev/nvme0n1 /dev/nvme1n1 /dev/nvme2n1 /dev/nvme3n1 /dev/nvme4n1 /dev/nvme5n1 /dev/nvme6n1 /dev/nvme7n1 /dev/nvme8n1 /dev/nvme9n1"
+  options['configuration'] = conf
+  # XXX we should make sure this configuration matches KVM json schema...
+
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
+url = ${template-kvm:location}/instance-kvm.cfg.jinja2
 output = $${buildout:directory}/$${:filename}
 extensions = jinja2.ext.do
 extra-context =
@@ -52,16 +89,9 @@ context =
   key ipv6 slap-configuration:ipv6
   key global_ipv4_prefix network-information:global-ipv4-network
   key storage_dict slap-configuration:storage-dict
-  key slapparameter_dict slap-configuration-vps:configuration
+
   key computer_id slap-configuration:computer-id
   raw openssl_executable_location ${openssl:location}/bin/openssl
-  $${:extra-context}
-
-[dynamic-template-kvm]
-<= jinja2-template-base
-url = ${template-kvm:location}/instance-kvm.cfg.jinja2
-filename = template-kvm.cfg
-extra-context =
   section slap_configuration slap-configuration
   raw ansible_promise_tpl ${template-ansible-promise:target}
   raw curl_executable_location ${curl:location}/bin/curl
@@ -92,8 +122,28 @@ extra-context =
   raw template_nginx ${template-nginx:target}
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw wipe_disk_wrapper ${buildout:directory}/bin/securedelete
-template-parts-destination = ${template-parts:target}
-template-replicated-destination = ${template-replicated:target}
-import-list = file parts :template-parts-destination
-              file replicated :template-replicated-destination
+  $${:extra-context}
 
+[dynamic-template-vps]
+<= jinja2-template-base
+filename = template-vps.cfg
+extra-context =
+  key slapparameter_dict slap-configuration-vps:configuration
+
+[dynamic-template-vpsbrute-4disks]
+<= jinja2-template-base
+filename = template-vpsbrute-4disks.cfg
+extra-context =
+  key slapparameter_dict slap-configuration-vpsbrute-4disks:configuration
+
+[dynamic-template-vpsbrute-6disks]
+<= jinja2-template-base
+filename = template-vpsbrute-6disks.cfg
+extra-context =
+  key slapparameter_dict slap-configuration-vpsbrute-6disks:configuration
+
+[dynamic-template-vpsbrute-4disks]
+<= jinja2-template-base
+filename = template-vpsbrute-10disks.cfg
+extra-context =
+  key slapparameter_dict slap-configuration-vpsbrute-10disks:configuration

software/rapidspace-vps/software.cfg

@@ -25,6 +25,22 @@ destination = ${directory:json-vps}/${:filename}
 <= download-vps-base
 destination = ${directory:json-kvm}/${:filename}
 
+[slap-configuration-common]
+# keep the 2 extra spaces after first line so that template is correcty generated
+common-all =
+  conf['auto-ballooning'] = False
+    conf['wipe-disk-ondestroy'] = True
+    conf['use-tap'] = True
+    conf['frontend-software-type'] = "default"
+    conf['frontend-software-url'] = "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
+    conf['frontend-additional-software-type'] = "default"
+    conf['frontend-additional-software-url'] = "chinary-frontend-sr"
+common-vpsbrute =
+  conf['ram-size'] = 1002496
+    conf['ram-max-size'] = 1014784
+    conf['cpu-count'] = 128
+    conf['cpu-max-count'] = 129
+
 [template]
 <= template-base
 # we need to overwrite _profile_base_location to current directory

software/rapidspace-vps/software.cfg.json

 {
   "name": "VPS",
-  "description": "VPS",
+  "description": "VPS/VPSBrute service from RapidSpace",
   "serialisation": "json-in-xml",
   "software-type": {
     "default": {
-      "title": "Default",
-      "description": "Default VPS",
+      "title": "Default VPS",
+      "description": "Default VPS with 40 cores, 256GB of RAM and 1 disk of 4TB",
+      "request": "../kvm/boot-image-input-schema.json",
+      "response": "../kvm/instance-kvm-output-schema.json",
+      "index": 0
+    },
+    "vpsbrute-4disks": {
+      "title": "Default VPSBrute (4disks)",
+      "description": "Default VPSBrute with 128 cores, 1TB of RAM and 4 disks of 4TB",
+      "request": "../kvm/boot-image-input-schema.json",
+      "response": "../kvm/instance-kvm-output-schema.json",
+      "index": 0
+    },
+    "vpsbrute-6disks": {
+      "title": "VPSBrute with 6 disks",
+      "description": "VPSBrute with 128 cores, 1TB of RAM and 6 disks of 4TB",
+      "request": "../kvm/boot-image-input-schema.json",
+      "response": "../kvm/instance-kvm-output-schema.json",
+      "index": 0
+    },
+    "vpsbrute-10disks": {
+      "title": "VPSBrute with 10 disks",
+      "description": "VPSBrute with 128 cores, 1TB of RAM and 10 disks of 4TB",
       "request": "../kvm/boot-image-input-schema.json",
       "response": "../kvm/instance-kvm-output-schema.json",
       "index": 0

stack/slapos.cfg

@@ -423,6 +423,8 @@ zope.exceptions = 5.2
 zope.interface = 7.1.1
 zope.testing = 5.0.1
 zope.testrunner = 6.6
+pycountry = 18.12.8
+fonttools = 3.44.0
 
 [versions:sys.version_info < (3,10)]
 # keep old statsmodels by default until slapos.toolbox is updated