diff options
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 1 | ||||
| -rwxr-xr-x | ci/deploy/deploy.sh | 8 | ||||
| -rwxr-xr-x | ci/kolla-build.sh | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index bd0e0878..55b2e164 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -41,6 +41,7 @@ do if [[ ! -z "$DAISYCORE_TAG" ]]; then pushd daisycloud-core git checkout $DAISYCORE_TAG + git fetch https://git.openstack.org/openstack/daisycloud-core refs/changes/91/441791/1 && git cherry-pick FETCH_HEAD popd fi diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 8c72a3cc..5fcea998 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -293,9 +293,11 @@ else echo "daisy install successfully" fi -echo "====== add relate config of kolla===========" -ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova" -ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu' > /etc/kolla/config/nova/nova-compute.conf" +if [ $IS_BARE == 0 ];then + echo "====== add relate config of kolla===========" + ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova" + ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf" +fi echo "===prepare cluster and pxe===" ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --cluster 'yes'" diff --git a/ci/kolla-build.sh b/ci/kolla-build.sh index 53ad8c16..6b7d330d 100755 --- a/ci/kolla-build.sh +++ b/ci/kolla-build.sh @@ -92,7 +92,7 @@ function cleanup_registry_server { echo "Removing containers... $containers_to_kill" (sudo docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null - if [[ ! -z "$containers_to_kill" ]]; then + if [[ ! -z "$volumes_to_remove" ]]; then echo "Removing volumes... $volumes_to_remove" (sudo docker volume rm ${volumes_to_remove} 2>&1) || true > /dev/null fi @@ -145,7 +145,7 @@ function pack_registry_data { function update_kolla_code { echo "Updating Kolla code" if [ ! -d $KOLLA_GIT_DIR ] ; then - mkdir -p $KOLLA_GIT_DIR + mkdir -p $KOLLA_GIT_DIR fi if [ ! -d $KOLLA_GIT_DIR/kolla ] ; then |