f-33: vm: start vms with multiple nic
All checks were successful
Release Pipeline / checksums (push) Successful in 4s
Release Pipeline / release (push) Successful in 11s
Release Pipeline / set-release-target (push) Successful in 2s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 4s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 4s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 4s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 4s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / publish (push) Successful in 0s
Release Pipeline / build (push) Successful in 1m36s
All checks were successful
Release Pipeline / checksums (push) Successful in 4s
Release Pipeline / release (push) Successful in 11s
Release Pipeline / set-release-target (push) Successful in 2s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 4s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 4s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 4s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 4s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / publish (push) Successful in 0s
Release Pipeline / build (push) Successful in 1m36s
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
0237acba81
commit
26d5805747
8 changed files with 309 additions and 25 deletions
|
|
@ -10,6 +10,7 @@ import (
|
|||
type Reservation struct {
|
||||
MAC string
|
||||
IP string
|
||||
Tag string // pose set:<Tag> sur l'entrée, pour cibler les options par interface
|
||||
}
|
||||
|
||||
func HostsDir(confDir, name string) string {
|
||||
|
|
@ -39,7 +40,11 @@ func WriteReservations(confDir, name, vmName string, res []Reservation) error {
|
|||
if r.MAC == "" || r.IP == "" {
|
||||
return fmt.Errorf("incomplete reservation for vm %q: mac=%q ip=%q", vmName, r.MAC, r.IP)
|
||||
}
|
||||
fmt.Fprintf(&sb, "%s,%s\n", r.MAC, r.IP)
|
||||
if r.Tag == "" {
|
||||
fmt.Fprintf(&sb, "%s,%s\n", r.MAC, r.IP)
|
||||
continue
|
||||
}
|
||||
fmt.Fprintf(&sb, "%s,%s,set:%s\n", r.MAC, r.IP, r.Tag)
|
||||
}
|
||||
|
||||
path := filepath.Join(dir, vmName)
|
||||
|
|
@ -49,6 +54,51 @@ func WriteReservations(confDir, name, vmName string, res []Reservation) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
// WriteVMOptions écrit les options DHCP propres à des interfaces de cette VM
|
||||
// sur ce subnet : elles suppriment la route par défaut — option 3 nue — et
|
||||
// réémettent les autres routes.
|
||||
//
|
||||
// Un override de l'option 121 remplace la précédente en entier, il ne s'y
|
||||
// ajoute pas (vérifié sur dnsmasq 2.90) : omettre la route vers le serveur de
|
||||
// métadonnées la ferait disparaître, et la VM ne se provisionnerait pas.
|
||||
func WriteVMOptions(confDir, name, vmName string, tags []string, c Config) error {
|
||||
if len(tags) == 0 {
|
||||
return RemoveVMOptions(confDir, name, vmName)
|
||||
}
|
||||
if c.InterfaceIP == nil {
|
||||
return fmt.Errorf("interface ip is required to build options for vm %q", vmName)
|
||||
}
|
||||
if c.DefaultGateway != nil {
|
||||
return fmt.Errorf("vm options for %q must not carry a default route", vmName)
|
||||
}
|
||||
|
||||
dir := OptsDir(confDir, name)
|
||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||
return fmt.Errorf("create %s: %w", dir, err)
|
||||
}
|
||||
|
||||
routes := strings.Join(classlessRoutes(c), ",")
|
||||
var sb strings.Builder
|
||||
for _, tag := range tags {
|
||||
fmt.Fprintf(&sb, "tag:%s,3\n", tag)
|
||||
fmt.Fprintf(&sb, "tag:%s,121,%s\n", tag, routes)
|
||||
}
|
||||
|
||||
path := filepath.Join(dir, vmName)
|
||||
if err := os.WriteFile(path, []byte(sb.String()), 0644); err != nil {
|
||||
return fmt.Errorf("write %s: %w", path, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func RemoveVMOptions(confDir, name, vmName string) error {
|
||||
path := filepath.Join(OptsDir(confDir, name), vmName)
|
||||
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
|
||||
return fmt.Errorf("remove %s: %w", path, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func RemoveReservations(confDir, name, vmName string) error {
|
||||
for _, dir := range []string{HostsDir(confDir, name), OptsDir(confDir, name)} {
|
||||
path := filepath.Join(dir, vmName)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue