diff --git a/bin/refresh.sh b/bin/refresh.sh index 63889f60..e19b907a 100755 --- a/bin/refresh.sh +++ b/bin/refresh.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -systemctl restart mariadb.service -systemctl status mariadb.service || exit $? +systemctl restart mysql.service +systemctl status mysql.service || exit $? /opt/compass/bin/manage_db.py createdb /opt/compass/bin/clean_installers.py --noasync /opt/compass/bin/clean_installation_logs.py diff --git a/install/cobbler.sh b/install/cobbler.sh index 346321e1..8845b3ae 100755 --- a/install/cobbler.sh +++ b/install/cobbler.sh @@ -144,20 +144,13 @@ chmod 644 /etc/httpd/conf.d/cobbler.conf sudo cp -rn /etc/xinetd.d /root/backup/ sudo cp $COMPASSDIR/misc/rsync /etc/xinetd.d/ -exit 0 + #sudo sed -i 's/^@dists=/# @dists=/g' /etc/debmirror.conf #sudo sed -i 's/^@arches=/# @arches=/g' /etc/debmirror.conf sudo rm -rf /var/lib/cobbler/config/systems.d/* -echo "disable iptables" sudo systemctl stop firewalld -if [[ "$?" == "0" ]]; then - echo "iptables is running" - exit 1 -else - echo "iptables is already stopped" -fi # echo "disable selinux temporarily" # echo 0 > /selinux/enforce diff --git a/install/compass.sh b/install/compass.sh index fa561970..dbb92c0e 100755 --- a/install/compass.sh +++ b/install/compass.sh @@ -158,7 +158,7 @@ else echo "redis has already started" fi -sudo systemctl status mariadb.service |grep running +sudo systemctl status mysql.service |grep running if [[ "$?" != "0" ]]; then echo "mysqld is not started" exit 1 diff --git a/install/dependency.sh b/install/dependency.sh index 69fc434b..1c9df576 100755 --- a/install/dependency.sh +++ b/install/dependency.sh @@ -10,7 +10,9 @@ if [ "$tempest" == "true" ]; then exit 1 fi fi -sudo yum install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp rabbitmq-server mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates mariadb mariadb-server mysql-devel python-virtualenv python-setuptools python-pip bc libselinux-python + +sudo yum install http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm -y +sudo yum install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp rabbitmq-server mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates mysql-devel mysql-server mysql MySQL-python python-virtualenv python-setuptools python-pip bc libselinux-python sudo yum --setopt=tsflags=noscripts -y remove redis sudo yum --enablerepo=remi,remi-test install -y redis @@ -54,5 +56,5 @@ sudo systemctl enable sshd.service sudo systemctl enable rsyslog.service sudo systemctl enable ntpd.service sudo systemctl enable redis.service -sudo systemctl enable mariadb.service -sudo systemctl disable firewalld +sudo systemctl enable mysql.service +sudo systemctl enable rabbitmq-server.service diff --git a/install/prepare.sh b/install/prepare.sh index 90894ec3..0d490c75 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -108,9 +108,9 @@ echo "update mysqld" mkdir -p /var/log/mysql chmod -R 777 /var/log/mysql sleep 10 -systemctl restart mariadb.service +systemctl restart mysql.service sudo sleep 10 -systemctl status mariadb.service +systemctl status mysql.service if [[ "$?" != "0" ]]; then echo "failed to restart mysqld" exit 1 @@ -144,9 +144,9 @@ if [[ "$?" != "0" ]]; then else echo "mysql database set succeeded" fi -sudo systemctl restart mariadb.service +sudo systemctl restart mysql.service sudo sleep 10 -sudo systemctl status mariadb.service +sudo systemctl status mysql.service if [[ "$?" != "0" ]]; then echo "mysqld is not started" exit 1 diff --git a/regtest/ansible/install/roles/compass/files/start.sh b/regtest/ansible/install/roles/compass/files/start.sh index 767b1ecf..929b4cda 100644 --- a/regtest/ansible/install/roles/compass/files/start.sh +++ b/regtest/ansible/install/roles/compass/files/start.sh @@ -9,13 +9,13 @@ workon compass-core RET=1 while [[ RET -ne 0 ]]; do - echo "waiting for mariadb to startup" + echo "waiting for mysql to startup" sleep 5 mysql -uroot -e "status" > /dev/null 2>&1 RET=$? done -echo "mariadb started" +echo "mysql started" # set mysql with default username and password mysqladmin -h127.0.0.1 --port=3306 -u root password root diff --git a/regtest/ansible/install/roles/compass/templates/start.sh.j2 b/regtest/ansible/install/roles/compass/templates/start.sh.j2 index 87dc01f2..66f40232 100644 --- a/regtest/ansible/install/roles/compass/templates/start.sh.j2 +++ b/regtest/ansible/install/roles/compass/templates/start.sh.j2 @@ -9,13 +9,13 @@ workon compass-core RET=1 while [[ RET -ne 0 ]]; do - echo "waiting for mariadb to startup" + echo "waiting for mysql to startup" sleep 5 mysql -uroot -e "status" > /dev/null 2>&1 RET=$? done -echo "mariadb started" +echo "mysql started" # set mysql with default username and password mysqladmin -h127.0.0.1 --port=3306 -u root password root