kvm: use new vnc url, fix missing unit on qemu 'maxmem' parameter

software/kvm/common.cfg

@@ -10,7 +10,7 @@ extends =
   ../../component/netcat/buildout.cfg
   ../../component/pycurl/buildout.cfg
   ../../stack/slapos.cfg
-  ../../stack/nodejs.cfg
+  ../../component/nodejs/buildout.cfg
   ../../stack/resilient/buildout.cfg
 
 # stacks are listed from most generic to most specific,
@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 68b66fb3e9020642e57f4a4ee266f2b3
+md5sum = c348188a6dcb15430bea0bad51c249fc
 download-only = true
 on-update = true
 
@@ -186,7 +186,7 @@ ignore-existing = true
 url = ${:_profile_base_location_}/template/template-kvm-run.in
 mode = 644
 filename = template-kvm-run.in
-md5sum = bd238397af6236b6b24b693012feeece
+md5sum = c6f1536a3502102dadbfb9d82496cc36
 download-only = true
 on-update = true
 

software/kvm/instance-kvm.cfg.jinja2

@@ -381,8 +381,8 @@ interface-url = {{ slapparameter_dict.get('monitor-interface-url', 'https://moni
 <= monitor-publish
 recipe = slapos.cookbook:publish
 ipv6 = ${slap-network-information:global-ipv6}
-backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc_auto.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
-url = ${request-slave-frontend:connection-url}/vnc_auto.html?host=${request-slave-frontend:connection-domainname}&port=${request-slave-frontend:connection-port}&encrypt=1&path=${request-slave-frontend:connection-resource}&password=${kvm-controller-parameter-dict:vnc-passwd}
+backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
+url = ${request-slave-frontend:connection-url}/vnc.html?host=${request-slave-frontend:connection-domainname}&port=${request-slave-frontend:connection-port}&encrypt=1&path=${request-slave-frontend:connection-resource}&password=${kvm-controller-parameter-dict:vnc-passwd}
 {% set disk_number = len(storage_dict) -%}
 maximum-extra-disk-amount = {{ disk_number }}
 {% set iface = 'eth0' -%}

software/kvm/template/template-kvm-run.in

@@ -264,7 +264,7 @@ if enable_device_hotplug != 'true':
   ram = '%sM,slots=128,maxmem=%sM' % (ram_size, ram_max_size)
 else:
   smp = '1,maxcpus=%s' % smp_max_count
-  ram = '%sM,slots=128,maxmem=%s' % (init_ram_size, ram_max_size)
+  ram = '%sM,slots=128,maxmem=%sM' % (init_ram_size, ram_max_size)
 kvm_argument_list = [qemu_path,
   '-enable-kvm', '-smp', smp, '-name', vm_name, '-m', ram, '-vga', 'std',
   '-drive', 'file=%s,if=%s,cache=%s,aio=%s' % (disk_path, disk_type, disk_cache, disk_aio),