Merge branch 'kvm-cluster'

slapos/recipe/kvm/template/kvm_run.in

@@ -28,6 +28,7 @@ virtual_hard_drive_gzipped = '%(virtual-hard-drive-gzipped)s'.strip().lower()
 nat_rules = '%(nat-rules)s'.strip()
 use_tap = '%(use-tap)s'.lower()
 use_nat = '%(use-nat)s'.lower()
+enable_vhost = '%(enable-vhost)s'.lower()
 tap_interface = '%(tap-interface)s'
 listen_ip = '%(ipv4)s'
 mac_address = '%(mac-address)s'
@@ -208,13 +209,16 @@ if use_nat == 'true':
     rules += ',guestfwd=tcp:10.0.2.101:443-cmd:%%s %%s %%s' %% (netcat_bin,
                                            cluster_doc_host, cluster_doc_port)
   nat_network_parameter = ['-netdev', rules,
-          '-device', 'e1000,netdev=lan%%s,mac=%%s' %% (number, mac_address)]
+          '-device', 'virtio-net-pci,netdev=lan%%s,mac=%%s' %% (number, mac_address)]
 if use_tap == 'true':
   number += 1
+  vhost = ''
+  if enable_vhost == 'true':
+    vhost = ',vhost=on'
   tap_network_parameter = ['-netdev',
-          'tap,id=lan%%s,ifname=%%s,script=no,downscript=no' %% (number,
-            tap_interface),
-          '-device', 'e1000,netdev=lan%%s,mac=%%s' %% (number, tap_mac_address)]
+          'tap,id=lan%%s,ifname=%%s,script=no,downscript=no%%s' %% (number,
+            tap_interface, vhost),
+          '-device', 'virtio-net-pci,netdev=lan%%s,mac=%%s' %% (number, tap_mac_address)]
 
 smp = smp_count
 if smp_options:

software/kvm/common.cfg

@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = da3b3bde94ac2c06759a89c78168df91
+md5sum = 52e115fe1aaf232994af9037bf7c292c
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 3fc6611feaabcacd7e51f3b5681120fd
+md5sum = 5700de1cadde0b5bede78f08e215f47a
 download-only = true
 on-update = true
 
@@ -213,7 +213,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-httpd.cfg
 template = ${:_profile_base_location_}/instance-kvm-http.cfg.in
 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-kvm-http.cfg
-md5sum = fc8b3259942d6dedbc01065358a00d71
+md5sum = 26a181a48046ce88570adb32334747ef
 context =
     key apache_location apache:location
     raw openssl_executable_location ${openssl:location}/bin/openssl

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

@@ -144,6 +144,13 @@
               "type": "string",
               "default": ""
             },
+            "state": {
+              "title": "State of this Virtual Machine",
+              "description": "Define if SlapOS should start or stop this VM.",
+              "type": "string",
+              "default": "started",
+              "enum": ["started", "stopped"]
+            },
             "ram-size": {
               "title": "RAM size",
               "description": "RAM size, in MB.",
@@ -151,7 +158,7 @@
               "default": 1024,
               "minimum": 128,
               "multipleOf": 128,
-              "maximum": 16384
+              "maximum": 92160
             },
             "disk-size": {
               "title": "Disk size",
@@ -290,6 +297,12 @@
                 443
               ]
             },
+            "enable-vhost": {
+              "title": "Use vhost-net to improve network performance of tap interface",
+              "description": "The vhost-net provides much improved network performance for your VM. Only work if the vhost-net kernel module is loaded and available on host machine, please keep this option off if you're not shure.",
+              "type": "boolean",
+              "default": false
+            },
             "data-to-vm": {
               "title": "Text content to send to this virtual machine.",
               "description": "Text content which will be written in a file 'data' of http server of this virtual machine instance. The file will be available via URL: http://10.0.2.100/data in the VM.",

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

@@ -28,6 +28,9 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
 software-type = kvm
 name = {{ instance_name }}
 sla-computer_guid = {{ dumps(kvm_parameter_dict.get('computer-guid', '')) }}
+{% if kvm_parameter_dict.get('state', '') == 'stopped' -%}
+state = stopped
+{% endif -%}
 
 config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
 config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
@@ -53,6 +56,7 @@ config-nat-rules = {{ nat_rules_list | join(' ') }}
 config-publish-nat-url = True
 config-use-nat = {{ use_nat }}
 config-use-tap = {{ dumps(kvm_parameter_dict.get('use-tap', True)) }}
+config-enable-vhost = {{ dumps(kvm_parameter_dict.get('enable-vhost', 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)) }}
@@ -189,7 +193,7 @@ mode = {{ mode }}
 
 # write cluster-data into file public/data
 {% if slapparameter_dict.get('cluster-data', '') -%}
-{{ writefile('cluster-data-content', '${http-server:root-dir}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
+{{ writefile('cluster-data-content', '${directory:webroot}/${hash-code:passwd}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
 {% endif -%}
 
 [publish]
@@ -203,6 +207,7 @@ extends =
 
 parts = 
   httpd
+  httpd-graceful
   httpd-promise
   publish
   directory-doc

software/kvm/instance-kvm-http.cfg.in

@@ -2,6 +2,7 @@
 
 parts = 
   httpd
+  httpd-graceful
   httpd-promise
 
 [directory]
@@ -12,6 +13,7 @@ srv = ${buildout:directory}/srv
 public = ${:srv}/public/
 log = ${:var}/log
 services = ${:etc}/service
+scripts = ${:etc}/run
 promises = ${:etc}/promise
 run = ${:var}/run
 document = ${:srv}/document
@@ -46,6 +48,14 @@ recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:services}/httpd
 command-line = "{{ apache_location }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
 
+[httpd-graceful]
+recipe = collective.recipe.template
+input = inline:
+  #!/bin/sh
+  exec kill -USR1 $(cat ${apache-conf:pid-file})
+output = ${directory:scripts}/httpd-graceful
+mode = 700
+
 [httpd-ssl]
 recipe = plone.recipe.command
 command = "{{ openssl_executable_location }}" req -newkey rsa -batch -new -x509 -days 3650 -nodes -keyout "${:key}" -out "${:cert}"

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

@@ -11,7 +11,7 @@
       "default": 1024,
       "minimum": 128,
       "multipleOf": 128,
-      "maximum": 16384
+      "maximum": 92160
     },
     "disk-size": {
       "title": "Disk size",
@@ -135,6 +135,12 @@
       "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"
     },
+    "enable-vhost": {
+      "title": "Use vhost-net to improve network performance of tap interface",
+      "description": "The vhost-net provides much improved network performance for your VM. Only work if the vhost-net kernel module is loaded and available on host machine, please keep this option off if you're not shure.",
+      "type": "boolean",
+      "default": false
+    },
     "enable-monitor": {
       "title": "Deploy monitoring tools",
       "description": "Deploy monitor instance to this kvm instance. It help to check instance status, log and promise results.",

software/kvm/instance-kvm.cfg.jinja2

@@ -150,6 +150,7 @@ controller-path = ${directory:scripts}/kvm_controller
 use-tap = ${slap-parameter:use-tap}
 use-nat = ${slap-parameter:use-nat}
 nat-rules = ${slap-parameter:nat-rules}
+enable-vhost = ${slap-parameter:enable-vhost}
 6tunnel-wrapper-path = ${directory:services}/6tunnel
 
 virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
@@ -387,7 +388,7 @@ tap-ipv4 = ${slap-network-information:tap-ipv4}
 {% endif -%}
 
 {% set kvm_http = 'http://${slap-network-information:local-ipv4}:' ~ slapparameter_dict.get('httpd-port', 8081) -%}
-{% if enable_http == 'True' %}
+{% if enable_http == 'true' %}
 {%   if use_nat == 'true' -%}
 {%     set kvm_http = 'http://10.0.2.100' -%}
 {%   endif %}
@@ -548,6 +549,7 @@ numa =
 nat-rules = 22 80 443
 use-nat = True
 use-tap = False
+enable-vhost = False
 
 virtual-hard-drive-url =
 virtual-hard-drive-md5sum =