diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg index a46f6033dd8808c7eaebd4f9f7bd956598cb69a9..e0193de4b273ce89e5420a24bfdc38b3e4453f9f 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 = c79448a49b1b3dc6e757b90f497c7be1 +md5sum = 12a99227828e834d97ee0c68246c467c [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 05d7f42da39bfc7b57ee6ec7d3c16e624c877670..e25a4f561030c0ccc3e37748037be74046c2983a 100644 --- a/software/kvm/instance-kvm.cfg.jinja2 +++ b/software/kvm/instance-kvm.cfg.jinja2 @@ -498,16 +498,15 @@ ipv6-network-info = recipe = plone.recipe.command 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') }} +ipv4-add-address = ip -4 address add {{ slap_configuration.get('tap-ipv4-addr') }}/{{ slap_configuration.get('tap-ipv4-netmask') }} dev \$IFACE {% if nat_restrict == 'true' -%} -route-default = route add default gw {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE +ipv4-add-default-route = ip route add default via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE {% elif global_ipv4_prefix -%} -route-default = ip route add {{ global_ipv4_prefix }} via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE src {{ slap_configuration.get('tap-ipv4-addr') }} +ipv4-add-default-route = ip route add {{ global_ipv4_prefix }} via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE src {{ slap_configuration.get('tap-ipv4-addr') }} {% else -%} -route-default = +ipv4-add-default-route = {% endif -%} +ipv4-set-link-up = ip link set dev \$IFACE up command = cat > ${:path} << EOF #!/bin/sh @@ -515,10 +514,9 @@ command = #try to be compatible with OS with old names ip a | grep eth0: && [ \$IFACE = ens3 ] && IFACE=eth0 ip a | grep eth1: && [ \$IFACE = ens4 ] && IFACE=eth1 - ${:ifconfig} - ${:route-iface} - ${:route-network} - ${:route-default} + ${:ipv4-add-address} + ${:ipv4-add-default-route} + ${:ipv4-set-link-up} EOF update-command = ${:command} {% endif -%}