From 51a8de4299f5df4e9510c787dc53bc6bbfe3ff25 Mon Sep 17 00:00:00 2001 From: Gregor Michels Date: Fri, 23 Dec 2022 13:26:14 +0100 Subject: [PATCH] ffl-ans-gw-core01: move offloader network hook into /usr/lib --- playbook_provision_gateway.yml | 14 ++++++++------ .../ffl-ans-gw-core01/etc/init.d/qemu-offloader | 4 ++-- .../ffl-ans-gw-core01/usr/lib}/offloader_vm_net_up | 0 3 files changed, 10 insertions(+), 8 deletions(-) rename {files => templates/gateways/ffl-ans-gw-core01/usr/lib}/offloader_vm_net_up (100%) diff --git a/playbook_provision_gateway.yml b/playbook_provision_gateway.yml index cec1555..b555e7e 100644 --- a/playbook_provision_gateway.yml +++ b/playbook_provision_gateway.yml @@ -80,13 +80,15 @@ - kmod-kvm-intel update_cache: yes - - name: deploy qemu network hook - copy: - src: files/offloader_vm_net_up - dest: /root/offloader_vm_net_up + - name: provision /usr/lib + template: + src: "{{ item }}" + dest: /usr/lib owner: root group: root mode: 0755 + with_fileglob: + - "templates/gateways/{{ inventory_hostname }}/usr/lib/*" - name: provision /etc/init.d template: @@ -105,7 +107,7 @@ marker_end: "END OFFLOADER" block: | /etc/init.d/qemu-offloader - /root/offloader_vm_net_up + /usr/lib/offloader_vm_net_up - name: enable offloader vm service service: @@ -130,6 +132,6 @@ to be cleaned up: - let procd gracefully kill the vm on stop/shutdown - - remove network hook /root/offloader_vm_net_up + - remove network hook /usr/lib/offloader_vm_net_up ----------------------------------------------------- EOB diff --git a/templates/gateways/ffl-ans-gw-core01/etc/init.d/qemu-offloader b/templates/gateways/ffl-ans-gw-core01/etc/init.d/qemu-offloader index ba6a1b8..a2e8778 100755 --- a/templates/gateways/ffl-ans-gw-core01/etc/init.d/qemu-offloader +++ b/templates/gateways/ffl-ans-gw-core01/etc/init.d/qemu-offloader @@ -15,8 +15,8 @@ start_service() { procd_append_param command -m 1G procd_append_param command -machine type=q35,accel=kvm procd_append_param command -drive file=/dev/sdb,cache=none,if=virtio,format=raw - procd_append_param command -nic tap,model=virtio-net-pci,script=/root/offloader_vm_net_up,downscript=no,ifname=tap0 - procd_append_param command -nic tap,model=virtio-net-pci,script=/root/offloader_vm_net_up,downscript=no,ifname=tap1 + procd_append_param command -nic tap,model=virtio-net-pci,script=/usr/lib/offloader_vm_net_up,downscript=no,ifname=tap0 + procd_append_param command -nic tap,model=virtio-net-pci,script=/usr/lib/offloader_vm_net_up,downscript=no,ifname=tap1 procd_append_param command -pidfile /var/run/qemu-offloader.pid procd_append_param command -chardev socket,path=/tmp/qga.qemu-offloader.sock,server=on,wait=off,id=qga0 procd_append_param command -device virtio-serial diff --git a/files/offloader_vm_net_up b/templates/gateways/ffl-ans-gw-core01/usr/lib/offloader_vm_net_up similarity index 100% rename from files/offloader_vm_net_up rename to templates/gateways/ffl-ans-gw-core01/usr/lib/offloader_vm_net_up