Merge pull request #32 from liath/more-reliable-cloud-init

More reliable cloud-init startup

builder/xenserver/iso/builder.go

@@ -191,6 +191,7 @@ func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (p
 		},
 		&commonsteps.StepCreateFloppy{
 			Files: self.config.FloppyFiles,
+			Label: "cidata",
 		},
 		&xscommon.StepHTTPServer{
 			Chan: httpReqChan,

examples/http/ubuntu-2004/user-data

@@ -1,4 +1,13 @@
 #cloud-config
+
+# hack for cloud-init per:
+# https://github.com/leakespeake/packer/blob/3f3e361751b4be9326b66771d96f2519bc8f885e/builders/vmware/vsphere-iso/ubuntu-server-20-04/hcl2/http/ubuntu-server-subiquity/user-data
+runcmd:
+  # to enable true auto-install for Ubuntu 20.04 with cloud-init nocloud (eliminates "Continue with autoinstall?" prompt)
+  - [eval, 'echo $(cat /proc/cmdline) "autoinstall" > /root/cmdline']
+  - [eval, 'mount -n --bind -o ro /root/cmdline /proc/cmdline']
+  - [eval, 'snap restart subiquity.subiquity-service']
+
 autoinstall:
   version: 1
   identity:
@@ -6,6 +15,8 @@ autoinstall:
     # This is the crypted pass of 'ubuntu'
     password: "$6$exDY1mhS4KUYCE/2$zmn9ToZwTKLhCw.b4/b.ZRTIZM30JZ4QrOQ2aOXJ8yk96xpcCof0kxKwuX1kqLG/ygbJ1f8wxED22bTL4F46P0"
     username: testuser
+  packages:
+    - xe-guest-utilities
   ssh:
     install-server: yes
     allow-pw: yes

examples/ubuntu/ubuntu-2004.pkr.hcl

@@ -65,12 +65,10 @@ source "xenserver-iso" "ubuntu-2004" {
   vm_memory      = 4096
   disk_size      = 20000
 
-  http_directory = "examples/http/ubuntu-2004"
+  floppy_files = [
-  boot_command   = [
+    "examples/http/ubuntu-2004/meta-data",
-    "<esc><f6> autoinstall ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/<enter><wait>",
+    "examples/http/ubuntu-2004/user-data",
-    "<f6><wait><esc><wait> autoinstall ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/<enter><wait>"
   ]
-  boot_wait      = "10s"
 
   ssh_username            = "testuser"
   ssh_password            = "ubuntu"
@@ -83,4 +81,4 @@ source "xenserver-iso" "ubuntu-2004" {
 
 build {
   sources = ["xenserver-iso.ubuntu-2004"]
-}
+}