mirror of
https://github.com/outbackdingo/matchbox.git
synced 2026-01-27 18:19:36 +00:00
fix: Add boot.ipx.0, relax cloud config reqs
* Add boot.ipex.0 because dnsmasq with proxyDHCP expects an iPXE boot script with a trailing '.0' * Remove requirement that cloud configs parse with coreos cloudinit, which doesn't allow scripts
This commit is contained in:
@@ -35,6 +35,7 @@ func (s *Server) HTTPHandler() http.Handler {
|
||||
mux := http.NewServeMux()
|
||||
// iPXE
|
||||
mux.Handle("/boot.ipxe", ipxeInspect())
|
||||
mux.Handle("/boot.ipxe.0", ipxeInspect())
|
||||
mux.Handle("/ipxe", ipxeHandler(s.store))
|
||||
// Pixiecore
|
||||
mux.Handle("/pixiecore/v1/boot/", pixiecoreHandler(s.store))
|
||||
|
||||
@@ -6,8 +6,6 @@ import (
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
|
||||
cloudinit "github.com/coreos/coreos-cloudinit/config"
|
||||
)
|
||||
|
||||
// Store maintains associations between machine attributes and configs.
|
||||
@@ -65,10 +63,6 @@ func (s *fileStore) CloudConfig(attrs MachineAttrs) (*CloudConfig, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !cloudinit.IsCloudConfig(string(b)) {
|
||||
log.Errorf("read an invalid cloud config for machine %+v", attrs)
|
||||
return nil, fmt.Errorf("read an invalid cloud config")
|
||||
}
|
||||
return &CloudConfig{
|
||||
Content: string(b),
|
||||
}, nil
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
REPO=dghubble/bootcfg
|
||||
QUAY_REPO=quay.io/dghubble/bootcfg
|
||||
REPO=coreos/bootcfg
|
||||
QUAY_REPO=quay.io/coreos/bootcfg
|
||||
GIT_SHA=$(git rev-parse HEAD)
|
||||
|
||||
# quay.io
|
||||
|
||||
Reference in New Issue
Block a user