diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg index 5c3a864afd6dd7c86c90385519073e971c939c2f..a46f6033dd8808c7eaebd4f9f7bd956598cb69a9 100644 --- a/software/kvm/buildout.hash.cfg +++ b/software/kvm/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2 [template-kvm] filename = instance-kvm.cfg.jinja2 -md5sum = 26a947c75792072a7b526cb18b617b10 +md5sum = c79448a49b1b3dc6e757b90f497c7be1 [template-kvm-cluster] filename = instance-kvm-cluster.cfg.jinja2.in diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2 index ad377452898aeabf21d09ab85427a8b697728b5d..05d7f42da39bfc7b57ee6ec7d3c16e624c877670 100644 --- a/software/kvm/instance-kvm.cfg.jinja2 +++ b/software/kvm/instance-kvm.cfg.jinja2 @@ -474,7 +474,7 @@ ipv4-network-info = gateway {{ slap_configuration.get('tap-ipv4-gateway') }} {% if enable_http == 'true' %} ${helper:blank-line} - Or run in your VM the command: wget -O- {{ kvm_http }}/netconfig.sh | /bin/sh - + Or run in your VM the command: wget -O- {{ kvm_http }}/${network-config-ipv4:filename} | /bin/sh - {% endif %} {% endif %} @@ -496,7 +496,8 @@ ipv6-network-info = {% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr') -%} [network-config-ipv4] recipe = plone.recipe.command -path = ${directory:public}/netconfig.sh +filename = netconfig.sh +path = ${directory:public}/${:filename} ifconfig = ifconfig \$IFACE {{ slap_configuration.get('tap-ipv4-addr') }} netmask {{ slap_configuration.get('tap-ipv4-netmask') }} route-iface = route add {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE route-network = route add -net {{ slap_configuration.get('tap-ipv4-network') }} netmask {{ slap_configuration.get('tap-ipv4-netmask') }} gw {{ slap_configuration.get('tap-ipv4-gateway') }}