From f0518706e08b0cc7572be7f7dd8cd952e4f798a6 Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <alain.takoudjou@nexedi.com> Date: Wed, 17 Jun 2015 16:49:48 +0200 Subject: [PATCH] kvm: Add missing configurations for erp5testnode --- software/kvm/instance-for-erp5testnode.cfg.in | 7 +++++++ software/kvm/software-for-erp5testnode.cfg | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/software/kvm/instance-for-erp5testnode.cfg.in b/software/kvm/instance-for-erp5testnode.cfg.in index a8f90522b..9747e2e8b 100644 --- a/software/kvm/instance-for-erp5testnode.cfg.in +++ b/software/kvm/instance-for-erp5testnode.cfg.in @@ -26,6 +26,9 @@ pull-backup = ${template-pull-backup:output} [storage-configuration] storage-home = +[network-information] +global-ipv4-network = + [slap-configuration] recipe = slapos.cookbook:slapconfiguration.serialised computer = $${slap-connection:computer-id} @@ -43,6 +46,7 @@ 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 @@ -51,10 +55,13 @@ context = raw dcron_executable_location ${dcron:location}/sbin/crond raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename} raw novnc_location ${noVNC:location} + raw netcat_bin ${netcat:location}/bin/netcat raw openssl_executable_location ${openssl:location}/bin/openssl raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64 raw qemu_img_executable_location ${kvm:location}/bin/qemu-img 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 websockify_executable_location ${buildout:directory}/bin/websockify template-parts-destination = ${template-parts:destination} template-replicated-destination = ${template-replicated:destination} diff --git a/software/kvm/software-for-erp5testnode.cfg b/software/kvm/software-for-erp5testnode.cfg index d3808ba0c..d6c32570f 100644 --- a/software/kvm/software-for-erp5testnode.cfg +++ b/software/kvm/software-for-erp5testnode.cfg @@ -5,6 +5,6 @@ extends = development.cfg [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-for-erp5testnode.cfg.in -md5sum = 5883432c9a004cf505db2718c596ce6a +md5sum = e0af93ba7209cabd5db6d9afcb15c2aa output = ${buildout:directory}/template.cfg mode = 0644 \ No newline at end of file -- 2.30.9