x/compass-core
Code Issues Proposed changes

Merge "kill dnsmasq to avoid conflict with dhcpd" into dev/experimental

Browse Source
This commit is contained in:
Jenkins 2014-11-22 12:40:01 +00:00 committed by Gerrit Code Review
commit b047e84aaf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/ci/test-install.sh
View File

@ -12,6 +12,8 @@ else
dhclient -r installation
dhclient installation
fi
# kill the dhcp service started by libvirt to avoid conflict with dhcpd
killall dnsmasq
source compass-core/install/install.conf.template
/bin/bash -x compass-core/install/install.sh || exit $?
echo "cache_peer 10.145.81.137 parent 3128 3130 default" >> /etc/squid/squid.conf