Merge pull request #141 from cybozu-go/fix-example

Fix example

examples/README.md

@@ -19,7 +19,7 @@ is as follows:
 To run the example, launch `placemat` by the following command:
 
 ```console
-$ sudo placemat cluster.example.yml
+$ sudo placemat2 cluster.example.yml
 ```
 
 The cluster configuration is described in [`cluster.example.yml`](cluster.example.yml).
@@ -38,15 +38,15 @@ It downloads boot images, and then starts [dnsmasq][] and [nginx][] on Ubuntu
 to work as a network boot server.
 
 The worker nodes run Qemu's default BIOS to boot from the network.  They load
-[iPXE][] provided by the boot node, and then load [CoreOS Container Linux][].
+[iPXE][] provided by the boot node, and then load [Flatcar Container Linux][].
 They are configured with empty disks, which will be seen as `/dev/vda`.
 
 You can log-in to the `boot` node by `ubuntu`/`ubuntu`.  As for the worker
 nodes, they are configured to accept auto login from the console.
 
 ```console
-$ sudo pmctl node enter boot        # login with ubuntu/ubuntu
-$ sudo pmctl node enter worker-1    # autologin as "core" user
+$ sudo pmctl2 node enter boot        # login with ubuntu/ubuntu
+$ sudo pmctl2 node enter worker-1    # autologin as "core" user
 
 # type Ctrl-q and Ctrl-x to leave from the node console
 ```
@@ -56,4 +56,4 @@ $ sudo pmctl node enter worker-1    # autologin as "core" user
 [nginx]: https://nginx.org/
 [UEFI HTTP Boot]: https://github.com/tianocore/tianocore.github.io/wiki/HTTP-Boot
 [iPXE]: https://ipxe.org/
-[CoreOS Container Linux]: https://coreos.com/os/docs/latest/
+[Flatcar Container Linux]: https://kinvolk.io/docs/flatcar-container-linux/latest/

examples/cluster.example.yml

@@ -4,6 +4,12 @@ type: external
 use-nat: true
 address: 172.16.0.1/24
 ---
+kind: Network
+name: bmc
+type: bmc
+use-nat: false
+address: 172.16.1.1/24
+---
 kind: Image
 name: ubuntu-image
 url: https://cloud-images.ubuntu.com/releases/20.04/release/ubuntu-20.04-server-cloudimg-amd64.img

examples/user-data.example.yml

@@ -71,14 +71,20 @@ write_files:
         "networkd": {"units": [{"name": "00-eth0.network", "contents": "[Match]\nName=eth0\n\n[Network]\nAddress=172.16.0.102"}]}
       }
 
+  - path: /etc/resolv.conf
+    content: |
+      nameserver 8.8.8.8
+
 runcmd:
-  - [ curl, -sSL, -o, /var/lib/dnsmasq/ipxe.efi, "http://boot.ipxe.org/ipxe.efi"]
-  - [ curl, -sSL, -o, /var/www/html/coreos_production_pxe.vmlinuz, "https://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz"]
-  - [ curl, -sSL, -o, /var/www/html/coreos_production_pxe_image.cpio.gz, "https://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe_image.cpio.gz"]
+  - [ systemctl, stop, systemd-resolved.service ]
+  - [ systemctl, disable, systemd-resolved.service ]
   - [ systemctl, enable, dnsmasq.service ]
   - [ systemctl, start, dnsmasq.service ]
   - [ systemctl, enable, nginx.service ]
   - [ systemctl, start, nginx.service ]
+  - [ curl, -sSL, -o, /var/lib/dnsmasq/ipxe.efi, "http://boot.ipxe.org/ipxe.efi" ]
+  - [ curl, -sSL, -o, /var/www/html/coreos_production_pxe.vmlinuz, "https://stable.release.flatcar-linux.net/amd64-usr/2605.12.0/flatcar_production_pxe.vmlinuz" ]
+  - [ curl, -sSL, -o, /var/www/html/coreos_production_pxe_image.cpio.gz, "https://stable.release.flatcar-linux.net/amd64-usr/2605.12.0/flatcar_production_pxe_image.cpio.gz" ]
 
 packages:
   - dnsmasq

v2/cmd/placemat2/sub/run.go

@@ -51,7 +51,7 @@ func run(yamls []string) error {
 
 	if config.cacheDir == "" {
 		if os.Getenv("SUDO_USER") != "" {
-			config.cacheDir = "/home/${SUDO_USER}/placemat_data"
+			config.cacheDir = os.ExpandEnv("/home/${SUDO_USER}/placemat_data")
 		} else {
 			config.cacheDir = config.dataDir
 		}