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:
Dalton Hubble
2015-12-21 14:56:36 -08:00
parent 364a3732e3
commit cdedb67b32
3 changed files with 3 additions and 8 deletions

View File

@@ -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))

View File

@@ -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

View File

@@ -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