From 93a2bc6d330c42d7abef3fdb130f88ac57bf4505 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sun, 4 Jan 2026 17:42:26 +0100 Subject: [PATCH 1/2] f-8: systemd: change systemd file #8 Signed-off-by: GnomeZworc --- .../{metadata_service => }/metadata@.service | 2 +- systemd/metadata_start/run-metadata-in-netns.sh | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) rename systemd/{metadata_service => }/metadata@.service (69%) delete mode 100644 systemd/metadata_start/run-metadata-in-netns.sh diff --git a/systemd/metadata_service/metadata@.service b/systemd/metadata@.service similarity index 69% rename from systemd/metadata_service/metadata@.service rename to systemd/metadata@.service index 54cf08a..626b97c 100644 --- a/systemd/metadata_service/metadata@.service +++ b/systemd/metadata@.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/local/bin/run-metadata-in-netns.sh %i +ExecStart=/opt/two/bin/metadata --vm %i [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/systemd/metadata_start/run-metadata-in-netns.sh b/systemd/metadata_start/run-metadata-in-netns.sh deleted file mode 100644 index 612dd18..0000000 --- a/systemd/metadata_start/run-metadata-in-netns.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e - -# Expects one argument: netns_bridge (e.g. vpc-00003_br-00002 or vpc1_br0) -arg="$1" -NETNS="${arg%%_*}" -ip_port="${arg#*_}" -IP="${ip_port%%-*}" -PORT="${ip_port#*-}" - -echo "start metadata ${NETNS} " - -exec ip netns exec "${NETNS}" \ - /usr/bin/metadata \ - -file "/opt/metadata/${arg}.conf" \ - -interface "${IP}" \ - -port "${PORT}" \ No newline at end of file From 989264681426a5fd472a5c39f8d740c9ddaeae94 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sun, 4 Jan 2026 17:43:51 +0100 Subject: [PATCH 2/2] f-8: code: start/stop metadata service Signed-off-by: GnomeZworc --- cmd/meta_cli/main.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/meta_cli/main.go b/cmd/meta_cli/main.go index a357991..9782b5f 100644 --- a/cmd/meta_cli/main.go +++ b/cmd/meta_cli/main.go @@ -7,6 +7,7 @@ import ( configuration "git.g3e.fr/syonad/two/internal/config/agent" "git.g3e.fr/syonad/two/internal/load_db/nocloud" "git.g3e.fr/syonad/two/pkg/db/kv" + "git.g3e.fr/syonad/two/pkg/systemd" ) func main() { @@ -22,6 +23,8 @@ func main() { flag.Parse() + service, _ := systemd.New() + conf, err := configuration.LoadConfig(*conf_file) if err != nil { fmt.Println(err) @@ -43,7 +46,9 @@ func main() { Password: *password, SSHKEY: *ssh_key, }, db) + service.Start("metadata@" + *vm_name) } else if *stop { nocloud.UnLoadNoCloudInDB(*vm_name, db) + service.Stop("metadata@" + *vm_name) } }