diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/kolla-build-vm.sh | 2 | ||||
-rwxr-xr-x | ci/kolla-build.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ci/kolla-build-vm.sh b/ci/kolla-build-vm.sh index 30113cfe..5609cd3c 100755 --- a/ci/kolla-build-vm.sh +++ b/ci/kolla-build-vm.sh @@ -186,6 +186,8 @@ function pre_check { yum install -y python2-pip pip install tox + # SELinux is not supported with the overlay2 graph driver on this kernel. + sed -i 's/--selinux-enabled /--selinux-enabled=false /g' /etc/sysconfig/docker || true # Just make sure docker is working. /usr/bin/systemctl restart docker } diff --git a/ci/kolla-build.sh b/ci/kolla-build.sh index cca98db5..fe7a6679 100755 --- a/ci/kolla-build.sh +++ b/ci/kolla-build.sh @@ -108,6 +108,7 @@ function create_daisy_vm_and_networks() { echo "====== Create Daisy VM ======" $CREATE_QCOW2_PATH/daisy-img-modify.sh -c $CREATE_QCOW2_PATH/centos-img-modify.sh -w $IMWORKDIR -a $DAISY_IP $PARAS_IMAGE + sed -i -e "/source * file/{s|source.*$|source file=\'$IMWORKDIR\/centos7.qcow2\'\/>|;}" $VMDEPLOY_DAISY_SERVER_VM virsh net-define $VMDELOY_DAISY_SERVER_NET virsh net-start daisy1 |