kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Node specific overlay and templating now functioning with other minor fixups

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-10-31 18:25:48 -07:00
parent 712f035b95
commit fe4bcb8bbd
12 changed files with 186 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -20,8 +20,8 @@ services: files
sudo systemctl restart dhcpd
build:
go build cmd/warewulfd/warewulfd.go
go build cmd/wwbuild/wwbuild.go
cd cmd/warewulfd; go build -o ../../warewulfd
cd cmd/wwbuild; go build -o ../../wwbuild
clean:
rm -f warewulfd

3
cmd/warewulfd/warewulfd.go
View File

@@ -12,6 +12,9 @@ import (
"github.com/hpcng/warewulf/internal/pkg/assets"
"net/http"
)
// TODO: https://github.com/danderson/netboot/blob/master/pixiecore/dhcp.go
// TODO: https://github.com/pin/tftp
const LocalStateDir = "/var/warewulf"

90
cmd/wwbuild/overlay-utils.go Normal file
View File

@@ -0,0 +1,90 @@
package main
import (
"bufio"
"fmt"
"io"
"os"
"path/filepath"
"strings"
)
func BuildOverlayDir(sourceDir string, destDir string, replace map[string]string) error {
err := os.Chdir(sourceDir)
if err != nil {
fmt.Println(err)
return err
}
err = filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if info.IsDir() {
err := os.MkdirAll(destDir + "/" + path, info.Mode())
if err != nil {
fmt.Println(err)
}
} else {
if filepath.Ext(path) == ".in" {
destFile := strings.TrimSuffix(path, ".in")
sourceFD, err := os.Open(sourceDir + "/" + path)
if err != nil {
return err
}
destFD, err :=os.OpenFile(destDir + "/" + destFile, os.O_RDWR|os.O_CREATE, info.Mode())
if err != nil {
return err
}
scanner := bufio.NewScanner(sourceFD)
w := bufio.NewWriter(destFD)
for scanner.Scan() {
newLine := scanner.Text()
for k, v := range replace {
replaceString := fmt.Sprintf("@%s@", strings.ToUpper(k))
newLine = strings.ReplaceAll(newLine, replaceString, v)
}
_, err := w.WriteString(newLine + "\n")
if err != nil {
return err
}
}
w.Flush()
sourceFD.Close()
destFD.Close()
} else {
sourceFD, err := os.Open(sourceDir + "/" + path)
if err != nil {
return err
}
defer sourceFD.Close()
destFD, err := os.OpenFile(destDir + "/" + path, os.O_RDWR|os.O_CREATE, info.Mode())
if err != nil {
return err
}
defer destFD.Close()
_, err = io.Copy(destFD, sourceFD)
if err != nil {
return err
}
}
}
return nil
})
if err != nil {
fmt.Println(err)
return err
}
return nil
}

49
cmd/wwbuild/wwbuild.go
View File

@@ -1,14 +1,14 @@
package main
import (
"fmt"
"github.com/hpcng/warewulf/internal/pkg/assets"
"github.com/hpcng/warewulf/internal/pkg/util"
"os"
"os/exec"
"path"
"github.com/hpcng/warewulf/internal/pkg/assets"
"strings"
)
@@ -74,21 +74,36 @@ func main(){
} else if os.Args[1] == "overlay" {
fmt.Printf("note: This needs to create an overlay for each node with macro expansions\n")
for _, node := range assets.FindAllNodes() {
overlayDir := fmt.Sprintf("/etc/warewulf/overlays/%s", node.Overlay)
if _, err := os.Stat(overlayDir); err == nil {
cmd := fmt.Sprintf("cd %s; find . | cpio --quiet -o -H newc | gzip -c > \"%s/provision/overlays/%s.img\"", overlayDir, LocalStateDir, node.Fqdn)
fmt.Printf("BUILDING OVERLAY: %s\n", node.Fqdn)
err := exec.Command("/bin/sh", "-c", cmd).Run()
if err != nil {
fmt.Printf("%s", err)
}
} else {
fmt.Printf("SKIPPING OVERLAY: (bad path) %s\n", overlayDir)
}
}
fmt.Printf("BUILDING OVERLAY: %s\n", node.Fqdn)
overlayDir := fmt.Sprintf("/etc/warewulf/overlays/%s", node.Overlay)
replace := make(map[string]string)
replace["HOSTNAME"] = node.HostName
replace["FQDN"] = node.Fqdn
replace["VNFS"] = node.Vnfs
replace["KERNELVERSION"] = node.KernelVersion
replace["GROUPNAME"] = node.GroupName
replace["DOMAIN"] = node.DomainName
for key, dev := range node.NetDevs {
replace[fmt.Sprintf("%s:NAME", key)] = key
replace[fmt.Sprintf("%s:HWADDR", key)] = strings.ReplaceAll(dev.Hwaddr, "-", ":")
replace[fmt.Sprintf("%s:IPADDR", key)] = dev.Ipaddr
replace[fmt.Sprintf("%s:NETMASK", key)] = dev.Netmask
replace[fmt.Sprintf("%s:GATEWAY", key)] = dev.Gateway
}
overlayDest := "/tmp/.overlay-" + util.RandomString(16)
BuildOverlayDir(overlayDir, overlayDest, replace)
cmd := fmt.Sprintf("cd %s; find . | cpio --quiet -o -H newc -F \"%s/provision/overlays/%s.img\"", overlayDest, LocalStateDir, node.Fqdn)
err := exec.Command("/bin/sh", "-c", cmd).Run()
if err != nil {
fmt.Printf("%s", err)
}
os.RemoveAll(overlayDest)
}
}
}

5
internal/pkg/assets/assets.go
View File

@@ -57,6 +57,7 @@ type NodeInfo struct {
Vnfs string
Overlay string
KernelVersion string
DomainName string
NetDevs map[string]netDevs
}
@@ -85,6 +86,7 @@ func FindAllNodes() []NodeInfo {
n.Vnfs = group.Vnfs
n.Overlay = group.Overlay
n.KernelVersion = group.KernelVersion
n.DomainName = group.DomainSuffix
n.NetDevs = node.NetDevs
if group.DomainSuffix != "" {
@@ -101,6 +103,9 @@ func FindAllNodes() []NodeInfo {
if node.Overlay != "" {
n.Overlay = node.Overlay
}
if node.DomainSuffix != "" {
n.DomainName = node.DomainSuffix
}
ret = append(ret, n)
}
}

64
internal/pkg/util/util.go
View File

@@ -2,40 +2,44 @@
package util
import (
"bufio"
"fmt"
"io"
"math/rand"
"os"
"strings"
// "strings"
)
func FileCopyReplace(sourceFile string, destFile string, replace map[string]string) error{
sourceFD, err := os.Open(sourceFile)
if err != nil {
return err
func RandomString(n int) string {
var letter = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
b := make([]rune, n)
for i := range b {
b[i] = letter[rand.Intn(len(letter))]
}
destFD, err := os.Create(destFile)
if err != nil {
return err
}
defer sourceFD.Close()
defer destFD.Close()
scanner := bufio.NewScanner(sourceFD)
w := bufio.NewWriter(destFD)
for scanner.Scan() {
newLine := scanner.Text()
for k, v := range replace {
replaceString := fmt.Sprintf("@{%s}", strings.ToUpper(k))
newLine = strings.Replace(newLine, replaceString, v, -1)
}
w.WriteString(newLine + "\n")
}
return w.Flush()
return string(b)
}
func CopyFile(source string, dest string) error {
sourceFD, err := os.Open(source)
if err != nil {
return err
}
finfo, err := sourceFD.Stat()
destFD, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE, finfo.Mode())
if err != nil {
return err
}
_, err = io.Copy(destFD, sourceFD)
if err != nil {
return err
}
sourceFD.Close()
destFD.Close()
return nil
}

18
nodes.yaml
View File

@@ -11,9 +11,9 @@ nodegroups:
netdevs:
eth0:
hwaddr: xx:xx:xx:xx:aa
ipaddr: x.x.x.x
netmask: x.x.x.x
gateway: x.x.x.x
ipaddr: 192.168.0.101
netmask: 255.255.255.0
gateway: 192.168.1.1
group_2:
comment: This is the group 2
vnfs: /var/chroots/centos-7
@@ -27,9 +27,9 @@ nodegroups:
netdevs:
eth0:
hwaddr: 00-0c-29-c3-bf-42
ipaddr: x.x.x.x
netmask: x.x.x.x
gateway: x.x.x.x
ipaddr: 192.168.1.100
netmask: 255.255.255.0
gateway: 192.168.1.1
type: ethernet
ib0:
hwaddr: xx:xx:xx:xx:xx
@@ -43,9 +43,9 @@ nodegroups:
netdevs:
eth0:
hwaddr: xx:xx:xx:xx:xx
ipaddr: x.x.x.x
netmask: x.x.x.x
gateway: x.x.x.x
ipaddr: 192.168.1.101
netmask: 255.255.255.0
gateway: 192.168.1.1
ib0:
hwaddr: xx:xx:xx:xx:xx
ipaddr: x.x.x.x

1
overlays/generic/etc/hostname.in Normal file
View File

@@ -0,0 +1 @@
@HOSTNAME@

1
overlays/generic/etc/sysconfig/network
View File

@@ -1 +0,0 @@
NETWORKING=yes

6
overlays/generic/etc/sysconfig/network-scripts/ifcfg-ens33
View File

@@ -1,6 +0,0 @@
DEVICE=ens33
BOOTPROTO=static
IPADDR=192.168.1.100
NETMASK=255.255.255.0
GATEWAY=192.168.1.1
ONBOOT=yes

8
overlays/generic/etc/sysconfig/network-scripts/ifcfg-eth0.in Normal file
View File

@@ -0,0 +1,8 @@
DEVICE=@ETH0:NAME@
NAME=@ETH0:NAME@
IPADDR=@ETH0:IPADDR@
NETMASK=@ETH0:NETMASK@
GATEWAY=@ETH0:GATEWAY@
HWADDR=@ETH0:HWADDR@
BOOTPROTO=static
ONBOOT=yes

2
overlays/generic/etc/sysconfig/network.in Normal file
View File

@@ -0,0 +1,2 @@
NETWORKING=yes
HOSTNAME=@FQDN@