diff options
Diffstat (limited to 'deploy')
| -rwxr-xr-x | deploy/check_openstack_progress.sh | 2 | ||||
| -rw-r--r-- | deploy/config/bm_environment/zte-baremetal1/network.yml | 4 | ||||
| -rw-r--r-- | deploy/environment.py | 3 |
3 files changed, 6 insertions, 3 deletions
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) |