diff --git a/api/server.go b/api/server.go index 19b14fbb..360cdc57 100644 --- a/api/server.go +++ b/api/server.go @@ -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)) diff --git a/api/store.go b/api/store.go index 9cd16d24..b7ec4b02 100644 --- a/api/store.go +++ b/api/store.go @@ -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 diff --git a/docker-push b/docker-push index a1b43c11..8793557e 100755 --- a/docker-push +++ b/docker-push @@ -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