openstack/devstack
Code Issues Proposed changes

Merge "Do not hardcode mysql service name when we have a variable for it"

Browse Source
This commit is contained in:
Jenkins 2012-10-02 21:26:23 +00:00 committed by Gerrit Code Review
commit 08ac8e6d9f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stack.sh
View File

@ -975,17 +975,6 @@ fi
if is_service_enabled mysql; then if is_service_enabled mysql; then
echo_summary "Configuring and starting MySQL" echo_summary "Configuring and starting MySQL"
# Start mysql-server
if [[ "$os_PACKAGE" = "rpm" ]]; then
# RPM doesn't start the service
start_service mysqld
# Set the root password - only works the first time
sudo mysqladmin -u root password $MYSQL_PASSWORD || true
fi
# Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:
sudo mysql -uroot -p$MYSQL_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"
# Update ``my.cnf`` for some local needs and restart the mysql service
if [[ "$os_PACKAGE" = "deb" ]]; then if [[ "$os_PACKAGE" = "deb" ]]; then
MY_CONF=/etc/mysql/my.cnf MY_CONF=/etc/mysql/my.cnf
MYSQL=mysql MYSQL=mysql
@ -994,6 +983,18 @@ if is_service_enabled mysql; then
MYSQL=mysqld MYSQL=mysqld
fi fi
# Start mysql-server
if [[ "$os_PACKAGE" = "rpm" ]]; then
# RPM doesn't start the service
start_service $MYSQL
# Set the root password - only works the first time
sudo mysqladmin -u root password $MYSQL_PASSWORD || true
fi
# Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:
sudo mysql -uroot -p$MYSQL_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"
# Now update ``my.cnf`` for some local needs and restart the mysql service
# Change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0) # Change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0)
sudo sed -i '/^bind-address/s/127.0.0.1/0.0.0.0/g' $MY_CONF sudo sed -i '/^bind-address/s/127.0.0.1/0.0.0.0/g' $MY_CONF