Network model, IPAM, interface layouts and the region/rack split (MAAS-style)
- fabrics, VLANs, subnets, IP ranges (dynamic/reserved/static), IPAM with adoption of addresses machines already have; rollcall fabric|vlan|subnet|range|ip - interface layouts (physical/bond/vlan, NICs by selector: boot, name, mac, fastest:N, ib:N) per machine or per tag; deployment allocates addresses and writes cloud-init network-config plus udev name rules (RHEL cloud images boot with net.ifnames=0); release frees them; rollcall layout, rollcall net show|set - region/rack: rollcall rack long-polls its desired state (per-MAC PXE files kept in the database, dnsmasq configuration and host files) and a BMC command queue, caches boot and OS images (kernels/initrds prefetched for TFTP), proxies the node API and tags requests with its name; the region runs an embedded rack controller; install-rack.sh, rollcall-rack.service - dnsmasq configuration generated per rack from the VLANs it serves (split pool for two racks); reload script restarts only on change and restores the last working config if dnsmasq does not come back (drilled in the lab) - web: Network page, per-machine network tab, layout action, tag layout; console: Network page, network section in the machine view, layout action - tests for candidates, plans (default, bond+VLAN, pinned, DHCP fallback), network-config, udev rules and dnsmasq rendering - lab: pve-vbmc address script finds the interface per BMC address Verified in the lab: embedded rack (10.213.77.0/24) and a remote rack controller on a second SDN segment (10.213.78.0/24): enlistment, commissioning, BMC through the rack's queue, image cache, deployment and phone-home through the rack; Debian 13, Ubuntu 24.04 and Rocky 9 with a static boot NIC and with an active-backup bond carrying VLAN 200. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e3d9373201
commit
736a7e38a3
31 files changed
+4357
-176
No files matched your search
+59
-17
@@ -49,6 +49,8 @@ type DeploySpec struct {
|
||||
Packages []string `json:"packages,omitempty"`
|
||||
UserData string `json:"user_data,omitempty"` // full #cloud-config override
|
||||
Wipe string `json:"wipe,omitempty"` // release: quick | full
|
||||
NetworkConfig string `json:"network_config,omitempty"`
|
||||
LinkRules string `json:"link_rules,omitempty"`
|
||||
}
|
||||
|
||||
type seedFile struct {
|
||||
@@ -165,7 +167,11 @@ func (s *Store) SetDeployed(ctx context.Context, id, os, version string) error {
|
||||
}
|
||||
|
||||
func (s *Store) SetReleased(ctx context.Context, id string) error {
|
||||
_, err := s.pool.Exec(ctx, `UPDATE machines SET state='ready', os=NULL, os_version=NULL, deployed_at=NULL, booted_at=NULL, last_seen=now() WHERE id=$1`, id)
|
||||
if _, err := s.pool.Exec(ctx, `DELETE FROM ip_addresses WHERE machine_id=$1 AND kind='auto'`, id); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err := s.pool.Exec(ctx, `UPDATE machines SET state='ready', os=NULL, os_version=NULL, deployed_at=NULL, booted_at=NULL, last_seen=now(),
|
||||
mgmt_ip=(SELECT ip FROM ip_addresses a WHERE a.machine_id=machines.id ORDER BY ip LIMIT 1), ib_ip=NULL WHERE id=$1`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -253,6 +259,11 @@ func yamlList(l []string) string {
|
||||
}
|
||||
|
||||
func (a *App) renderSeed(j *Job, sp DeploySpec, token string) []seedFile {
|
||||
base := a.cfg.ServerURL
|
||||
m, merr := a.store.Get(context.Background(), j.MachineID)
|
||||
if merr == nil {
|
||||
base = a.urlFor(m)
|
||||
}
|
||||
meta := fmt.Sprintf("instance-id: %s\nlocal-hostname: %s\n", j.ID, sp.Hostname)
|
||||
ud := sp.UserData
|
||||
if ud == "" {
|
||||
@@ -274,20 +285,27 @@ func (a *App) renderSeed(j *Job, sp DeploySpec, token string) []seedFile {
|
||||
if len(sp.Packages) > 0 {
|
||||
fmt.Fprintf(&b, "packages: %s\n", yamlList(sp.Packages))
|
||||
}
|
||||
fmt.Fprintf(&b, "phone_home:\n url: %s/api/v1/phone-home/%s\n post: [instance_id, hostname, fqdn, pub_key_ed25519]\n tries: 10\n", a.cfg.ServerURL, token)
|
||||
fmt.Fprintf(&b, "phone_home:\n url: %s/api/v1/phone-home/%s\n post: [instance_id, hostname, fqdn, pub_key_ed25519]\n tries: 10\n", base, token)
|
||||
b.WriteString("final_message: \"rollcall: deployed $hostname up after $UPTIME s\"\n")
|
||||
ud = b.String()
|
||||
}
|
||||
if m, err := a.store.Get(context.Background(), j.MachineID); err == nil {
|
||||
if merr == nil {
|
||||
if frags, err := a.tagFragments(context.Background(), m); err == nil && len(frags) > 0 {
|
||||
ud = multipartUserData(ud, frags)
|
||||
}
|
||||
}
|
||||
return []seedFile{
|
||||
files := []seedFile{
|
||||
{Path: "var/lib/cloud/seed/nocloud/meta-data", Mode: "0600", Content: meta},
|
||||
{Path: "var/lib/cloud/seed/nocloud/user-data", Mode: "0600", Content: ud},
|
||||
{Path: "etc/cloud/cloud.cfg.d/99-rollcall.cfg", Mode: "0644", Content: "# written by rollcall at deploy time\ndatasource_list: [ NoCloud, None ]\n"},
|
||||
}
|
||||
if sp.NetworkConfig != "" {
|
||||
files = append(files, seedFile{Path: "var/lib/cloud/seed/nocloud/network-config", Mode: "0600", Content: sp.NetworkConfig})
|
||||
}
|
||||
if sp.LinkRules != "" {
|
||||
files = append(files, seedFile{Path: "etc/udev/rules.d/70-rollcall-net.rules", Mode: "0644", Content: sp.LinkRules})
|
||||
}
|
||||
return files
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- PXE
|
||||
@@ -337,9 +355,9 @@ LABEL recommission
|
||||
`
|
||||
|
||||
// deployAppend derives the deploy-mode cmdline from commission_append (same image, no agent token).
|
||||
func (a *App) deployAppend(token string) string {
|
||||
func (a *App) deployAppend(base, token string) string {
|
||||
var parts []string
|
||||
for _, p := range strings.Fields(a.cfg.CommissionAppend) {
|
||||
for _, p := range strings.Fields(a.appendFor(base)) {
|
||||
if strings.HasPrefix(p, "rollcall.token=") || strings.HasPrefix(p, "rollcall.nopoweroff") {
|
||||
continue
|
||||
}
|
||||
@@ -351,13 +369,13 @@ func (a *App) deployAppend(token string) string {
|
||||
|
||||
func (a *App) writePXEDeploy(m *Machine, j *Job, sp DeploySpec, token string) error {
|
||||
body := fmt.Sprintf(deployTmpl, time.Now().Format(time.RFC3339), m.ID, j.ID, j.Kind, sp.OS, sp.Version, sp.Disk,
|
||||
m.ID, j.Kind, sp.OS, j.ID, a.deployAppend(token), a.cfg.CommissionAppend)
|
||||
m.ID, j.Kind, sp.OS, j.ID, a.deployAppend(a.urlFor(m), token), a.appendFor(a.urlFor(m)))
|
||||
return a.writePXEBody(m, body)
|
||||
}
|
||||
|
||||
func (a *App) writePXEDeployed(m *Machine) error {
|
||||
body := fmt.Sprintf(deployedTmpl, time.Now().Format(time.RFC3339), m.ID, deref(m.OS), deref(m.OSVersion),
|
||||
deref(m.NodeName), deref(m.OS), m.ID, deref(m.OS), a.cfg.CommissionAppend)
|
||||
deref(m.NodeName), deref(m.OS), m.ID, deref(m.OS), a.appendFor(a.urlFor(m)))
|
||||
return a.writePXEBody(m, body)
|
||||
}
|
||||
|
||||
@@ -443,40 +461,64 @@ func (a *App) handleDeploy(w http.ResponseWriter, r *http.Request) {
|
||||
fail(w, 409, err)
|
||||
return
|
||||
}
|
||||
// node name + management IP: keep an existing one, otherwise allocate like a stateless node
|
||||
// node name: keep the existing one unless another is asked for
|
||||
name, mgmt, ib := deref(m.NodeName), deref(m.MgmtIP), deref(m.IBIP)
|
||||
if req.Hostname != "" && req.Hostname != name {
|
||||
name = ""
|
||||
}
|
||||
if name == "" {
|
||||
if name, mgmt, ib, err = a.allocate(r.Context(), str(a.cfg.ClusterVars["name_format"]), req.Hostname); err != nil {
|
||||
if name, _, _, err = a.allocatePools(r.Context(), str(a.cfg.ClusterVars["name_format"]), req.Hostname, false); err != nil {
|
||||
fail(w, 409, err)
|
||||
return
|
||||
}
|
||||
if err := a.store.SetNodeAddr(r.Context(), m.ID, name, mgmt, ib); err != nil {
|
||||
fail(w, 500, err)
|
||||
m.NodeName = &name
|
||||
}
|
||||
// addresses: the network plan (layout, IPAM); without a network model, the legacy pools
|
||||
netcfg, links := "", ""
|
||||
var warnings []string
|
||||
if len(a.subnetsSnapshot()) > 0 {
|
||||
plan, err := a.netPlan(r.Context(), m, true)
|
||||
if err != nil {
|
||||
fail(w, 409, err)
|
||||
return
|
||||
}
|
||||
m, _ = a.store.Get(r.Context(), m.ID)
|
||||
if err := a.exportDnsmasq(r.Context()); err != nil {
|
||||
log.Printf("dnsmasq export: %v", err)
|
||||
warnings = plan.Warnings
|
||||
if pm, pib := plan.primaryIPs(); pm != "" {
|
||||
mgmt, ib = pm, pib
|
||||
}
|
||||
nb, _ := json.MarshalIndent(networkConfig(plan), "", " ")
|
||||
netcfg = string(nb) + "\n"
|
||||
links = linkRules(plan)
|
||||
} else if mgmt == "" {
|
||||
if _, mgmt, ib, err = a.allocatePools(r.Context(), "", name, true); err != nil {
|
||||
fail(w, 409, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
if err := a.store.SetNodeAddr(r.Context(), m.ID, name, mgmt, ib); err != nil {
|
||||
fail(w, 500, err)
|
||||
return
|
||||
}
|
||||
m, _ = a.store.Get(r.Context(), m.ID)
|
||||
keys := req.SSHKeys
|
||||
if keys == nil {
|
||||
keys = a.configSSHKeys()
|
||||
}
|
||||
sp := DeploySpec{OS: meta.Name, Version: meta.Version,
|
||||
ImageURL: a.cfg.ServerURL + "/os/" + meta.Name + "/" + meta.Version + "/disk.raw.zst",
|
||||
ImageURL: a.urlFor(m) + "/os/" + meta.Name + "/" + meta.Version + "/disk.raw.zst",
|
||||
SHA256: meta.SHA256, Size: meta.Size, RawSize: meta.RawSize, Disk: disk.Path, DiskSerial: disk.Serial,
|
||||
Hostname: name, Domain: str(a.cfg.ClusterVars["domain"]), SSHKeys: keys, PackageUpgrade: req.PackageUpgrade,
|
||||
Packages: req.Packages, UserData: req.UserData}
|
||||
Packages: req.Packages, UserData: req.UserData, NetworkConfig: netcfg, LinkRules: links}
|
||||
out, err := a.startJob(r.Context(), m, "deploy", sp, req.Boot)
|
||||
if err != nil {
|
||||
fail(w, 409, err)
|
||||
return
|
||||
}
|
||||
out["mgmt_ip"] = mgmt
|
||||
out["rack"] = a.rackOf(m)
|
||||
if len(warnings) > 0 {
|
||||
out["warnings"] = warnings
|
||||
}
|
||||
writeJSON(w, 200, out)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user