x/compass-core
Code Issues Proposed changes

kill dnsmasq to avoid conflict with dhcpd

Browse Source 
libvirt start dnsmasq to provide dhcp service on virbr0,
but unfortunately it by default binds on all interfaces.
to avoid conflict with dhcpd started by cobbler later, kill all
dnsmasq since it won't be used by ci anyway.

Change-Id: I006f6c3e3493a34c4770cff0b35ee8f4b2b5293c
This commit is contained in:
zhaoxinyu 2014-11-21 08:28:19 -08:00
parent bd9fd8a83c
commit afba46ce6b
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 -r installation
dhclient installation dhclient installation
fi fi
# kill the dhcp service started by libvirt to avoid conflict with dhcpd
killall dnsmasq
source compass-core/install/install.conf.template source compass-core/install/install.conf.template
/bin/bash -x compass-core/install/install.sh || exit $? /bin/bash -x compass-core/install/install.sh || exit $?
echo "cache_peer 10.145.81.137 parent 3128 3130 default" >> /etc/squid/squid.conf echo "cache_peer 10.145.81.137 parent 3128 3130 default" >> /etc/squid/squid.conf