x/compass-core
Code Issues Proposed changes

kill dnsmasq when installing

Browse Source 
It seems cobbler installation will auto start dnsmasq. Kill it forcely before restart cobblerd

Change-Id: I5701102ac6d78f1f6ce24b05ba3f8395fec3d29c
This commit is contained in:
xiaodongwang
2015-02-01 00:03:22 -08:00
parent 22e0daf05b
commit 98c97e5d6f
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
install/cobbler.sh
View File

@@ -164,6 +164,11 @@ mkdir -p /var/log/cobbler/tasks
mkdir -p /var/log/cobbler/anamon mkdir -p /var/log/cobbler/anamon
chmod -R 777 /var/log/cobbler chmod -R 777 /var/log/cobbler
# kill dnsmasq service
chkconfig dnsmasq off
service dnsmasq stop
killall -9 dnsmasq
sudo service httpd restart sudo service httpd restart
sudo service cobblerd restart sudo service cobblerd restart
sudo cobbler get-loaders sudo cobbler get-loaders

6
install/compass_web.sh
View File

@@ -25,15 +25,15 @@ if [[ $LOCAL_REPO = "y" ]]; then
download -u "${LOCAL_REPO_US}/cirros-0.3.2-x86_64-disk.img" -u "${LOCAL_REPO_HUAWEI}/cirros-0.3.2-x86_64-disk.img" cirros-0.3.2-x86_64-disk.img copy /var/www/compass_web/v2 || exit $? download -u "${LOCAL_REPO_US}/cirros-0.3.2-x86_64-disk.img" -u "${LOCAL_REPO_HUAWEI}/cirros-0.3.2-x86_64-disk.img" cirros-0.3.2-x86_64-disk.img copy /var/www/compass_web/v2 || exit $?
if [[ $SUPPORT_CENTOS_6_5 = "y" ]]; then if [[ $SUPPORT_CENTOS_6_5 = "y" ]]; then
mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.5 mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.5
download -u "${LOCAL_REPO_US}/centos/6.5/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.5/centos_repo.tag.gz" CentOS-6.5-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.5 || exit $? download -u "${LOCAL_REPO_US}/centos/6.5/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.5/centos_repo.tar.gz" CentOS-6.5-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.5 || exit $?
fi fi
if [[ $SUPPORT_CENTOS_6_6 = "y" ]]; then if [[ $SUPPORT_CENTOS_6_6 = "y" ]]; then
mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.6 mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.6
download -u "${LOCAL_REPO_US}/centos/6.6/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.6/centos_repo.tag.gz" CentOS-6.6-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.6 || exit $? download -u "${LOCAL_REPO_US}/centos/6.6/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.6/centos_repo.tar.gz" CentOS-6.6-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.6 || exit $?
fi fi
if [[ $SUPPORT_CENTOS_7_0 = "y" ]]; then if [[ $SUPPORT_CENTOS_7_0 = "y" ]]; then
mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/7.0 mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/7.0
download -u "${LOCAL_REPO_US}/centos/7.0/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/7.0/centos_repo.tag.gz" CentOS-7.0-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/7.0 || exit $? download -u "${LOCAL_REPO_US}/centos/7.0/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/7.0/centos_repo.tar.gz" CentOS-7.0-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/7.0 || exit $?
fi fi
if [[ $SUPPORT_UBUNTU_12_04 = "y" ]]; then if [[ $SUPPORT_UBUNTU_12_04 = "y" ]]; then
mkdir -p /var/www/compass_web/v2/apt.repos.d/ubuntu/12.04 mkdir -p /var/www/compass_web/v2/apt.repos.d/ubuntu/12.04

1
install/dependency.sh
View File

@@ -52,3 +52,4 @@ sudo chkconfig redis on
sudo chkconfig mysqld on sudo chkconfig mysqld on
sudo chkconfig iptables off sudo chkconfig iptables off
sudo chkconfig ip6tables off sudo chkconfig ip6tables off
sudo chkconfig dnsmasq off

8
install/prepare.sh
View File

@@ -90,19 +90,19 @@ fi
mkdir -p /var/log/httpd mkdir -p /var/log/httpd
chmod -R 777 /var/log/httpd chmod -R 777 /var/log/httpd
mkdir -p /var/log/mysql
chmod -R 777 /var/log/mysql
sudo service httpd restart sudo service httpd restart
sudo service httpd status sudo service httpd status
if [[ "$?" != "0" ]]; then if [[ "$?" != "0" ]]; then
echo "squid is not started" echo "httpd is not started"
exit 1 exit 1
else else
echo "squid conf is updated" echo "httpd conf is updated"
fi fi
#update mysqld #update mysqld
echo "update mysqld" echo "update mysqld"
mkdir -p /var/log/mysql
chmod -R 777 /var/log/mysql
sudo service mysqld restart sudo service mysqld restart
sudo service mysqld status sudo service mysqld status
if [[ "$?" != "0" ]]; then if [[ "$?" != "0" ]]; then