summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xci/deploy/deploy.sh3
-rwxr-xr-xdeploy/check_openstack_progress.sh2
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/network.yml4
-rw-r--r--deploy/environment.py3
-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
9 files changed, 48 insertions, 4 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 181d2d6a..3118d083 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -310,7 +310,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/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index 1f150896..15dbcdda 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -34,7 +34,7 @@ source /root/daisyrc_admin
echo "check openstack installing progress..."
cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p' | tr -d " "`
-maxcount=180
+maxcount=360
count=0
while true; do
diff --git a/deploy/config/bm_environment/zte-baremetal1/network.yml b/deploy/config/bm_environment/zte-baremetal1/network.yml
index ad0ec646..b4140903 100644
--- a/deploy/config/bm_environment/zte-baremetal1/network.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/network.yml
@@ -38,12 +38,14 @@ networks:
vlan_id: 172
name: 'STORAGE'
- cidr: '172.70.0.0/24'
- gateway: '172.70.0.0'
+ gateway: '172.70.0.1'
ip_ranges:
- 'start': '172.70.0.2'
'end': '172.70.0.100'
vlan_id: 173
'name': 'EXTERNAL'
+ network_name: 'admin_external'
+ mapping: 'physnet1'
- cidr: '10.20.7.0/24'
gateway: '10.20.7.1'
ip_ranges:
diff --git a/deploy/environment.py b/deploy/environment.py
index 2adec494..a6ef4ab5 100644
--- a/deploy/environment.py
+++ b/deploy/environment.py
@@ -232,7 +232,8 @@ class VirtualEnvironment(DaisyEnvironmentBase):
disks = [disk_file]
ceph_disk_name = self.deploy_struct.get('ceph_disk_name', '')
- if ceph_disk_name and ceph_disk_name != '/dev/sda' and 'CONTROLLER_LB' in roles:
+ # if ceph_disk_name and ceph_disk_name != '/dev/sda' and 'CONTROLLER_LB' in roles:
+ if ceph_disk_name and ceph_disk_name != '/dev/sda':
ceph_size = self.deploy_struct.get('disks', {}).get('ceph', MIN_CEPH_DISK_SIZE)
ceph_disk_file = path_join(self.storage_dir, name + '_data.qcow2')
create_virtual_disk(ceph_disk_file, ceph_size)
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'/>