diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 13 | ||||
| -rwxr-xr-x | deploy/check_openstack_progress.sh | 2 | ||||
| -rw-r--r-- | deploy/environment.py | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 27d91f84..3118d083 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -294,10 +294,8 @@ echo "====== generate known_hosts file in daisy vm ======" touch $WORKSPACE/known_hosts scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/ -if [ $IS_BARE == 0 ];then - echo "====== add relate config of kolla ======" - ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK" -fi +echo "====== add relate config of kolla ======" +ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK" echo "====== prepare cluster and pxe ======" ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --cluster 'yes'" @@ -368,14 +366,13 @@ if [ $? -ne 0 ]; then fi -if [ $IS_BARE == 0 ];then - echo "====== post deploy ======" - ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK" -fi +echo "====== post deploy ======" +ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK" echo "====== deploy successfully ======" exit 0 + # # END of main ############################################################################ 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/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) |