introduce kvm-cluster software-type

software/kvm/common.cfg

@@ -85,7 +85,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 4c8f07da2217e54163c265fe6fe3d41d
+md5sum = 5fdeb07b7baaf0dfa9219f0d6ba1b140
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -93,7 +93,15 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = aae627dc6cfc9c728f61a3f12c525cf7
+md5sum = 717f22f56ca1afbe736489c15a332013
+download-only = true
+on-update = true
+
+[template-kvm-cluster]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
+mode = 644
+md5sum = 1c8ba5a64b53a182001f553fb5f6fff8
 download-only = true
 on-update = true
 

software/kvm/development.cfg

@@ -19,7 +19,7 @@ develop =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = master
+branch = kvm-cluster
 git-executable = ${git:location}/bin/git
 
 [slapos.core-repository]

software/kvm/instance-kvm-cluster-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+
+  "title": "Input Parameters",
+  "properties": {
+    "frontend": {
+      "frontend-instance-guid": {
+        "title": "Frontend Instance ID",
+        "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
+        "type": "string",
+        "default": "SOFTINST-11031"
+      },
+      "frontend-software-type": {
+        "title": "Frontend Software Type",
+        "description": "Type of the frontend instance, like \"frontend\".",
+        "type": "string",
+        "default": "frontend"
+      },
+      "frontend-software-url": {
+        "title": "Frontend Software URL",
+        "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
+        "type": "string",
+        "format": "uri",
+        "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg"
+      },
+      "type": "object"
+    },
+    "kvm-partition-dict": {
+      "description": "kvm instances definition",
+      "patternProperties": {
+        ".*": {
+            "properties": {
+              "ram-size": {
+                "title": "RAM size",
+                "description": "RAM size, in MB.",
+                "type": "integer",
+                "default": 1024,
+                "minimum": 128,
+                "multipleOf": 128,
+                "maximum": 16384
+              },
+              "disk-size": {
+                "title": "Disk size",
+                "description": "Disk size, in GB.",
+                "type": "integer",
+                "default": 10,
+                "minimum": 1,
+                "maximum": 80
+              },
+              "disk-type": {
+                "title": "Disk type",
+                "description": "Type of QEMU disk drive.",
+                "type": "string",
+                "default": "virtio",
+                "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio"]
+              },
+          
+              "cpu-count": {
+                "title": "CPU count",
+                "description": "Number of CPU cores.",
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 8
+              },
+          
+              "nbd-host": {
+                "title": "NBD hostname",
+                "description": "hostname (or IP) of the NBD server containing the boot image.",
+                "type": "string",
+                "format": ["host-name", "ip-address", "ipv6"],
+                "default": "debian.nbd.vifib.net"
+              },
+              "nbd-port": {
+                "title": "NBD port",
+                "description": "Port of the NBD server containing the boot image.",
+                "type": "integer",
+                "default": 1024,
+                "minimum": 1,
+                "maximum": 65535
+              },
+          
+              "nbd2-host": {
+                "title": "Second NBD hostname",
+                "description": "hostname (or IP) of the second NBD server (containing drivers for example).",
+                "type": "string",
+                "format": ["host-name", "ip-address", "ipv6"]
+              },
+              "nbd2-port": {
+                "title": "Second NBD port",
+                "description": "Port of the second NBD server containing the boot image.",
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 65535
+              },
+          
+              "virtual-hard-drive-url": {
+                "title": "Existing disk image URL",
+                "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",
+                "format": "uri",
+                "type": "string"
+              },
+              "virtual-hard-drive-md5sum": {
+                "title": "Checksum of virtual hard drive",
+                "description": "MD5 checksum of virtual hard drive, used if virtual-hard-drive-url is specified.",
+                "type": "string"
+              },
+              "virtual-hard-drive-gzipped": {
+                "title": "Define if virtual hard drive to download is gzipped",
+                "description": "Define if virtual hard drive to download is gzipped using gzip. This help to reduce size of file to download.",
+                "type": "boolean",
+                "default": false
+              },
+          
+              "use-tap": {
+                "title": "Use QEMU TAP network interface",
+                "description": "Use QEMU TAP network interface, requires a bridge on SlapOS Node. If false, use user-mode network stack (NAT).",
+                "type": "boolean",
+                "default": false
+              },
+              "nat-rules": {
+                "title": "List of rules for NAT of QEMU user mode network stack.",
+                "description": "List of rules for NAT of QEMU user mode network stack, as comma-separated list of ports. For each port specified, it will redirect port x of the VM (example: 80) to the port x + 10000 of the public IPv6 (example: 10080). Defaults to \"22 80 443\". Ignored if \"use-tap\" parameter is enabled.",
+                "type": "string"
+              }
+            },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  }
+}
\ No newline at end of file

software/kvm/instance-kvm-cluster.cfg.jinja2.in

+{% set publish_dict = {} -%}
+{% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
+
+[request-common]
+recipe = slapos.cookbook:request
+software-url = ${slap-connection:software-release-url}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
+config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
+
+# Request kvm instances
+{% for instance_name, kvm_parameter_dict in slapparameter_dict.get('kvm-partition-dict', {'kvm-default': {}}).items() -%}
+{% set section = 'request-' ~ instance_name -%}
+[{{ section }}]
+<= request-common
+software-type = kvm
+name = {{ instance_name }}
+sla-computer_guid = {{ dumps(kvm_parameter_dict.get('computer-guid', computer_id)) }}
+
+config-fontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
+config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
+config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg')) }}
+config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
+config-nbd-port = {{ dumps(kvm_parameter_dict.get('nbd-port', 1024)) }}
+config-nbd-host = {{ dumps(kvm_parameter_dict.get('nbd-host', '')) }}
+config-nbd2-port = {{ dumps(kvm_parameter_dict.get('nbd-port2', 1024)) }}
+config-nbd2-host = {{ dumps(kvm_parameter_dict.get('nbd-host2', '')) }}
+config-ram-size = {{ dumps(kvm_parameter_dict.get('ram-size', 1024)) }}
+config-disk-size = {{ dumps(kvm_parameter_dict.get('disk-size', 10)) }}
+config-disk-type = {{ dumps(kvm_parameter_dict.get('disk-type', 'virtio')) }}
+config-cpu-count = {{ dumps(kvm_parameter_dict.get('cpu-count', 1)) }}
+
+{% set nat_rules_list = kvm_parameter_dict.get('nat-rules', [22, 80, 443]) -%}
+config-nat-rules = {{ nat_rules_list | join(' ') }}
+config-use-tap = {{ dumps(kvm_parameter_dict.get('use-tap', False)) }}
+config-virtual-hard-drive-url = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
+config-virtual-hard-drive-md5sum = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
+config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-gzipped', False)) }}
+return = 
+  backend-url
+  url
+{% do publish_dict.__setitem__(instance_name ~ '-backend-url', '${' ~ section ~ ':connection-backend-url}') -%}
+{% do publish_dict.__setitem__(instance_name ~ '-url', '${' ~ section ~ ':connection-url}') -%}
+{% endfor %}
+
+[publish]
+recipe = slapos.cookbook:publish
+{% for name, value in publish_dict.items() -%}
+{{   name }} = {{ value }}
+{% endfor %}
+
+[buildout]
+parts = publish
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
\ No newline at end of file

software/kvm/instance-kvm.cfg.jinja2

@@ -202,7 +202,7 @@ key-file = ${slap-connection:key-file}
 cert-file = ${slap-connection:cert-file}
 computer-id = ${slap-connection:computer-id}
 partition-id = ${slap-connection:partition-id}
-name = VNC Frontend
+name = ${slap-parameter:frontend-instance-name}
 software-type = ${slap-parameter:frontend-software-type}
 slave = true
 config-host = ${novnc-instance:ip}
@@ -236,6 +236,7 @@ url = ${request-slave-frontend:connection-url}/vnc_auto.html?host=${request-slav
 frontend-software-type = frontend
 frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
 frontend-instance-guid =
+frontend-instance-name = VNC Frontend
 nbd-port = 1024
 nbd-host =
 nbd2-port = 1024

software/kvm/instance.cfg.in

@@ -8,6 +8,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = $${:kvm}
+kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
 kvm = $${dynamic-template-kvm:rendered}
 nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
@@ -30,6 +31,30 @@ url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
 
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = $${buildout:directory}/$${:filename}
+extensions = jinja2.ext.do
+mode = 0644
+extra-context =
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    key ipv4 slap-configuration:ipv4
+    key ipv6 slap-configuration:ipv6
+    key slapparameter_dict slap-configuration:configuration
+    key computer_id slap-configuration:computer
+    $${:extra-context}
+
+[dynamic-template-kvm-cluster-parameters]
+
+[dynamic-template-kvm-cluster]
+<= jinja2-template-base
+template = ${template-kvm-cluster:location}/instance-kvm-cluster.cfg.jinja2.in
+filename = template-kvm-cluster.cfg
+extra-context =
+  section parameter_dict dynamic-template-kvm-cluster-parameters
+
 [dynamic-template-kvm]
 recipe = slapos.recipe.template:jinja2
 template = ${template-kvm:location}/instance-kvm.cfg.jinja2

software/kvm/software.cfg

@@ -3,41 +3,41 @@ extends = common.cfg
 
 [versions]
 PyRSS2Gen = 1.1
-apache-libcloud = 0.15.1
-async = 0.6.1
+apache-libcloud = 0.16.0
 cns.recipe.symlink = 0.2.3
 collective.recipe.template = 1.11
 ecdsa = 0.11
-erp5.util = 0.4.41
-gitdb = 0.5.4
+erp5.util = 0.4.42
+gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 slapos.recipe.download = 1.0.dev-r4053
-slapos.toolbox = 0.40.4
-smmap = 0.8.2
+slapos.recipe.template = 2.6
+slapos.toolbox = 0.46.1
+smmap = 0.9.0
 websockify = 0.6.0
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# websockify==0.6.0
-numpy = 1.8.2
-
-# Required by:
-# slapos.toolbox==0.40.4
-GitPython = 0.3.2.RC1
+# slapos.toolbox==0.46.1
+GitPython = 0.3.6
 
 # Required by:
-# slapos.toolbox==0.40.4
+# slapos.toolbox==0.46.1
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.40.4
+# slapos.toolbox==0.46.1
 feedparser = 5.1.3
 
+# Required by:
+# slapos.toolbox==0.46.1
+lockfile = 0.10.2
+
 # Required by:
 # websockify==0.6.0
-numpy = 1.9.0
+numpy = 1.9.1
 
 # Required by:
-# slapos.toolbox==0.40.4
+# slapos.toolbox==0.46.1
 paramiko = 1.15.2