Remove deprecated kvmplus software_type.

software/kvm/common.cfg

@@ -74,13 +74,6 @@ md5sum = 87197471aa93863c310204e8865b5ac1
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
-[template-kvmplus]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kvmplus.cfg.in
-md5sum = c8e92237eeda93caca1132b5202c3a02
-output = ${buildout:directory}/template-kvmplus.cfg
-mode = 0644
-
 [template-nbd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nbd.cfg.in
@@ -98,6 +91,6 @@ mode = 0644
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 68788763d23f70f24b9e575871c903a8
+md5sum = 0a98e34aaec7097a84066c0665e3a49a
 output = ${buildout:directory}/template.cfg
 mode = 0644

software/kvm/instance-kvmplus.cfg.in

-#############################
-#
-# Instanciate kvm+
-#
-#############################
-
-# Deprecated. Just specify amount of RAM / disk you want in instance parameter.
-
-[buildout]
-extends = ${template-kvm:output}
-
-[slap-parameter]
-ram-size = 2048
-disk-size = 20
\ No newline at end of file

software/kvm/instance.cfg.in

@@ -10,7 +10,6 @@ offline = true
 recipe = slapos.cookbook:softwaretype
 default = ${template-kvm:output}
 kvm = ${template-kvm:output}
-kvm+ = ${template-kvmplus:output}
 nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}