|
...
|
...
|
@@ -71,9 +71,7 @@ mkdir -p $vm_dir
|
|
71
|
71
|
rm -f $vm_dir/disk
|
|
72
|
72
|
|
|
73
|
73
|
# Create a copy of the base image
|
|
74
|
|
-# qemu-img create -f qcow2 -b ${BASE_IMAGE} $vm_dir/disk
|
|
75
|
|
-cp $image_dir/disk $vm_dir/disk
|
|
76
|
|
-cp $image_dir/kernel $vm_dir/kernel
|
|
|
74
|
+qemu-img create -f qcow2 -b $image_dir/disk $vm_dir/disk
|
|
77
|
75
|
|
|
78
|
76
|
# Back to devstack
|
|
79
|
77
|
cd $TOP_DIR
|
|
...
|
...
|
@@ -112,8 +110,8 @@ cat > $LIBVIRT_XML <<EOF
|
|
112
|
112
|
<memory>$GUEST_RAM</memory>
|
|
113
|
113
|
<os>
|
|
114
|
114
|
<type>hvm</type>
|
|
115
|
|
- <kernel>$vm_dir/kernel</kernel>
|
|
116
|
|
- <cmdline>root=/dev/vda console=ttyS0 init=/usr/lib/cloud-init/uncloud-init ds=nocloud ubuntu-pass=ubuntu</cmdline>
|
|
|
115
|
+ <kernel>$image_dir/kernel</kernel>
|
|
|
116
|
+ <cmdline>root=/dev/vda ro console=ttyS0 init=/usr/lib/cloud-init/uncloud-init ds=nocloud ubuntu-pass=ubuntu</cmdline>
|
|
117
|
117
|
</os>
|
|
118
|
118
|
<features>
|
|
119
|
119
|
<acpi/>
|