kvm: Drop horrible copy and paste for the test.

software/kvm/instance-for-erp5testnode.cfg.in

 [buildout]
-parts =
-  switch-softwaretype
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-extends = ${template-resilient-templates:output}
+extends = ${template-default:output}
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
 default = $${:test}
-kvm = $${dynamic-template-kvm:rendered}
-nbd = ${template-nbd:output}
-frontend = ${template-frontend:output}
-
-kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
-kvm-import = $${dynamic-template-kvm-import:rendered}
-kvm-export = $${dynamic-template-kvm-export:rendered}
-
-# Used for the test of resiliency. The system wants a "test" software_type.
-test = $${dynamic-template-kvm-resilient-test:rendered}
-
-frozen = ${instance-frozen:output}
-pull-backup = ${template-pull-backup:output}
-
-# XXX - If this configuration is not generated by slapgrid, use empty values
-[storage-configuration]
-storage-home = 
-
-[network-information]
-global-ipv4-network = 
-
-[slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
-storage-home = $${storage-configuration:storage-home}
-
-[dynamic-template-kvm]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm:location}/instance-kvm.cfg.jinja2
-rendered = $${buildout:directory}/template-kvm.cfg
-extensions = jinja2.ext.do
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    key global_ipv4_prefix network-information:global-ipv4-network
-    key slapparameter_dict slap-configuration:configuration
-    key storage_dict slap-configuration:storage-dict
-    key tap_network_dict slap-configuration:tap-network-information-dict
-    raw ansible_promise_tpl ${template-ansible-promise:location}/${template-ansible-promise:filename}
-    raw curl_executable_location ${curl:location}/bin/curl
-    raw dash_executable_location ${dash:location}/bin/dash
-    raw dcron_executable_location ${dcron:location}/sbin/crond
-    raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
-    raw file_download_script ${file-download-script:location}/${file-download-script:filename}
-    raw logrotate_cfg ${template-logrotate-base:rendered}
-    raw novnc_location ${noVNC:location}
-    raw netcat_bin ${netcat:location}/bin/netcat
-    raw openssl_executable_location ${openssl:location}/bin/openssl
-    raw python_executable ${buildout:executable}
-    raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
-    raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
-    raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
-    raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
-    raw template_httpd_cfg ${template-httpd:rendered}
-    raw template_content ${template-content:location}/${template-content:filename}
-    raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
-    raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
-    raw template_monitor ${monitor2-template:rendered}
-    raw websockify_executable_location ${buildout:directory}/bin/websockify
-template-parts-destination = ${template-parts:destination}
-template-replicated-destination = ${template-replicated:destination}
-import-list = file parts :template-parts-destination
-              file replicated :template-replicated-destination
-mode = 0644
-
-[dynamic-template-kvm-resilient]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-resilient:location}/instance-kvm-resilient.cfg.jinja2
-rendered = $${buildout:directory}/template-kvm-resilient.cfg
-extensions = jinja2.ext.do
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    key slapparameter_dict slap-configuration:configuration
-    raw curl_executable_location ${curl:location}/bin/curl
-    raw template_monitor ${monitor2-template:rendered}
-template-parts-destination = ${template-parts:destination}
-template-replicated-destination = ${template-replicated:destination}
-import-list = file parts :template-parts-destination
-              file replicated :template-replicated-destination
-mode = 0644
-
-[dynamic-template-kvm-import]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-import:location}/instance-kvm-import.cfg.jinja2.in
-rendered = $${buildout:directory}/template-kvm-import.cfg
-extensions = jinja2.ext.do
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
-    raw pbsready_import_template ${pbsready-import:output}
-    raw template_monitor ${monitor2-template:rendered}
-    key slapparameter_dict slap-configuration:configuration
-    raw zcat_binary ${gzip:location}/bin/zcat
-    raw gzip_binary ${gzip:location}/bin/gzip
-mode = 0644
-
-[dynamic-template-kvm-export]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-export:location}/instance-kvm-export.cfg.jinja2
-rendered = $${buildout:directory}/template-kvm-export.cfg
-extensions = jinja2.ext.do
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    raw kvm_template $${dynamic-template-kvm:rendered}
-    raw template_kvm_export ${template-kvm-export-script:location}/${template-kvm-export-script:filename}
-    key pbsready_export_template template-pbsready-export:rendered
-    raw gzip_binary ${gzip:location}/bin/gzip
-    key slapparameter_dict slap-configuration:configuration
-mode = 0644
-
-[dynamic-template-kvm-resilient-test]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-resilient-test:location}/instance-kvm-resilient-test.cfg.jinja2
-rendered = $${buildout:directory}/template-kvm-resilient-test.cfg
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    key slapparameter_dict slap-configuration:configuration
-    raw bin_directory ${buildout:bin-directory}
-mode = 0644

software/kvm/software-for-erp5testnode.cfg

@@ -8,3 +8,10 @@ url = ${:_profile_base_location_}/instance-for-erp5testnode.cfg.in
 md5sum = 9e026495cbb0f5ea43adb2afb8574475
 output = ${buildout:directory}/template.cfg
 mode = 0644
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+md5sum = 061604d32cc626352dc3d221bdeaf804
+output = ${buildout:directory}/template-default.cfg
+mode = 0644