diff --git a/Documentation/api.md b/Documentation/api.md index d7795a55..d188dfb6 100644 --- a/Documentation/api.md +++ b/Documentation/api.md @@ -11,7 +11,7 @@ Serves a static iPXE boot script which gathers client machine attributes and cha **Response** #!ipxe - chain ipxe?uuid=${uuid}&mac=${net0/mac:hexhyp}&domain=${domain}&hostname=${hostname}&serial=${serial} + chain ipxe?uuid=${uuid}&mac=${mac:hexhyp}&domain=${domain}&hostname=${hostname}&serial=${serial} Client's booted with the `/ipxe.boot` endpoint will introspect and make a request to `/ipxe` with the `uuid`, `mac`, `hostname`, and `serial` value as query arguments. @@ -32,7 +32,7 @@ Finds the profile for the machine and renders the network boot config (kernel, o **Response** #!ipxe - kernel /assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp} coreos.first_boot=1 coreos.autologin + kernel /assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp} coreos.first_boot=1 coreos.autologin initrd /assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz boot diff --git a/Documentation/matchbox.md b/Documentation/matchbox.md index 441937ff..94c49e4c 100644 --- a/Documentation/matchbox.md +++ b/Documentation/matchbox.md @@ -65,7 +65,7 @@ Profiles reference an Ignition config, Cloud-Config, and/or generic config by na "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "coreos.autologin" ] diff --git a/examples/profiles/bootkube-controller.json b/examples/profiles/bootkube-controller.json index 0f3c43df..f1bf6e76 100644 --- a/examples/profiles/bootkube-controller.json +++ b/examples/profiles/bootkube-controller.json @@ -6,7 +6,7 @@ "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ "root=/dev/sda1", - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/bootkube-worker.json b/examples/profiles/bootkube-worker.json index 8ef6ad47..ec857f53 100644 --- a/examples/profiles/bootkube-worker.json +++ b/examples/profiles/bootkube-worker.json @@ -6,7 +6,7 @@ "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ "root=/dev/sda1", - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/etcd-proxy.json b/examples/profiles/etcd-proxy.json index 683cbea4..b78b945a 100644 --- a/examples/profiles/etcd-proxy.json +++ b/examples/profiles/etcd-proxy.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/etcd.json b/examples/profiles/etcd.json index ab2b1d31..b558190e 100644 --- a/examples/profiles/etcd.json +++ b/examples/profiles/etcd.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/etcd3-proxy.json b/examples/profiles/etcd3-proxy.json index b4f970d8..82be7b23 100644 --- a/examples/profiles/etcd3-proxy.json +++ b/examples/profiles/etcd3-proxy.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/etcd3.json b/examples/profiles/etcd3.json index 063c4fb6..7dc4ea95 100644 --- a/examples/profiles/etcd3.json +++ b/examples/profiles/etcd3.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/install-reboot.json b/examples/profiles/install-reboot.json index 7bca6aa6..a0d303c9 100644 --- a/examples/profiles/install-reboot.json +++ b/examples/profiles/install-reboot.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/install-shutdown.json b/examples/profiles/install-shutdown.json index 6ac2c508..6e0a4687 100644 --- a/examples/profiles/install-shutdown.json +++ b/examples/profiles/install-shutdown.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/k8s-controller.json b/examples/profiles/k8s-controller.json index c6404003..647ef6e8 100644 --- a/examples/profiles/k8s-controller.json +++ b/examples/profiles/k8s-controller.json @@ -6,7 +6,7 @@ "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ "root=/dev/sda1", - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/k8s-worker.json b/examples/profiles/k8s-worker.json index cc2c26dd..5c074fbc 100644 --- a/examples/profiles/k8s-worker.json +++ b/examples/profiles/k8s-worker.json @@ -6,7 +6,7 @@ "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ "root=/dev/sda1", - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/simple-install.json b/examples/profiles/simple-install.json index a11545bf..2496efe1 100644 --- a/examples/profiles/simple-install.json +++ b/examples/profiles/simple-install.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/simple.json b/examples/profiles/simple.json index 22d1590a..0c39f093 100644 --- a/examples/profiles/simple.json +++ b/examples/profiles/simple.json @@ -5,7 +5,7 @@ "kernel": "/assets/coreos/1185.3.0/coreos_production_pxe.vmlinuz", "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/examples/profiles/torus.json b/examples/profiles/torus.json index bb032c1c..0491ccf7 100644 --- a/examples/profiles/torus.json +++ b/examples/profiles/torus.json @@ -6,7 +6,7 @@ "initrd": ["/assets/coreos/1185.3.0/coreos_production_pxe_image.cpio.gz"], "args": [ "root=/dev/sda1", - "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", + "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", "coreos.first_boot=yes", "console=tty0", "console=ttyS0", diff --git a/matchbox/http/ipxe.go b/matchbox/http/ipxe.go index 3068a434..69a2384f 100644 --- a/matchbox/http/ipxe.go +++ b/matchbox/http/ipxe.go @@ -11,7 +11,7 @@ import ( ) const ipxeBootstrap = `#!ipxe -chain ipxe?uuid=${uuid}&mac=${net0/mac:hexhyp}&domain=${domain}&hostname=${hostname}&serial=${serial} +chain ipxe?uuid=${uuid}&mac=${mac:hexhyp}&domain=${domain}&hostname=${hostname}&serial=${serial} ` var ipxeTemplate = template.Must(template.New("iPXE config").Parse(`#!ipxe