summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-05-26 10:13:00 +0800
committerAlex Yang <yangyang1@zte.com.cn>2017-05-26 10:15:03 +0800
commit27473298c290b39a876f7e67ce3d5e6b5b9ef799 (patch)
tree2e78b05f56e6addc0e10ce31df5382734434b982
parent8f3626f39a5e0eb1be7a971dcc2accf5a0b8b569 (diff)
Create ceph disk in bash script
Change-Id: Ib80710c784d384ebc27eb0f51fcb4384017eecca Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
-rwxr-xr-xci/deploy/deploy.sh3
-rw-r--r--templates/virtual_environment/vms/computer01.xml8
-rw-r--r--templates/virtual_environment/vms/computer02.xml8
-rw-r--r--templates/virtual_environment/vms/controller01.xml8
-rw-r--r--templates/virtual_environment/vms/controller02.xml8
-rw-r--r--templates/virtual_environment/vms/controller03.xml8
6 files changed, 42 insertions, 1 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 6c88dc5a..27d91f84 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -312,7 +312,8 @@ if [ $IS_BARE == 0 ];then
virsh net-autostart daisy2
virsh net-start daisy2
for ((i=0;i<${#VM_MULTINODE[@]};i++));do
- qemu-img create -f qcow2 ${VM_STORAGE}/${VM_MULTINODE[$i]}.qcow2 200G
+ qemu-img create -f qcow2 ${VM_STORAGE}/${VM_MULTINODE[$i]}.qcow2 120G
+ qemu-img create -f qcow2 ${VM_STORAGE}/${VM_MULTINODE[$i]}_data.qcow2 150G
virsh define ${VMDEPLOY_NODE[$i]}
virsh start ${VM_MULTINODE[$i]}
done
diff --git a/templates/virtual_environment/vms/computer01.xml b/templates/virtual_environment/vms/computer01.xml
index 00d27182..290fe32f 100644
--- a/templates/virtual_environment/vms/computer01.xml
+++ b/templates/virtual_environment/vms/computer01.xml
@@ -38,6 +38,14 @@
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/computer01_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/computer02.xml b/templates/virtual_environment/vms/computer02.xml
index b2b48bf0..ada7e1a4 100644
--- a/templates/virtual_environment/vms/computer02.xml
+++ b/templates/virtual_environment/vms/computer02.xml
@@ -38,6 +38,14 @@
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/computer02_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/controller01.xml b/templates/virtual_environment/vms/controller01.xml
index fbf14f16..b55e1507 100644
--- a/templates/virtual_environment/vms/controller01.xml
+++ b/templates/virtual_environment/vms/controller01.xml
@@ -38,6 +38,14 @@
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/controller01_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/controller02.xml b/templates/virtual_environment/vms/controller02.xml
index 931c1f28..d17a07a2 100644
--- a/templates/virtual_environment/vms/controller02.xml
+++ b/templates/virtual_environment/vms/controller02.xml
@@ -38,6 +38,14 @@
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/controller02_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/controller03.xml b/templates/virtual_environment/vms/controller03.xml
index 8f1c0f02..186868fb 100644
--- a/templates/virtual_environment/vms/controller03.xml
+++ b/templates/virtual_environment/vms/controller03.xml
@@ -38,6 +38,14 @@
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/controller03_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>