Cloud-init drive is the first drive - boot fails

[killroy1971]

I've set up a terrafor set up using an imported Fedora Cloud disk image.

When I run the terraform plan, the Cloud-init drive is created before the VM's OS drive. The VM starts, but it attempts to boot from the cloud-init drive, with is assigned the device /dev/xvda, not /dev/xvdb which is what happens if I do this through the GUI.

If I disconnect the VM boots, but the boot device remains /dev/xvdb and I can't change it. If I reattach the cloud-init drive, it's still assigned to /dev/xvda.

Is there a way to fix this drive order issue?