openstack/devstack
Code Issues Proposed changes

Merge "Allow skip the database server installation"

Browse Source
This commit is contained in:
Zuul 2022-01-12 15:40:57 +00:00 committed by Gerrit Code Review
commit 6d55b2a439
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/databases/mysql
View File

@ -12,6 +12,7 @@ _XTRACE_DB_MYSQL=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL} MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
INSTALL_DATABASE_SERVER_PACKAGES=$(trueorfalse True INSTALL_DATABASE_SERVER_PACKAGES)
register_database mysql register_database mysql
@ -175,18 +176,20 @@ EOF
chmod 0600 $HOME/.my.cnf chmod 0600 $HOME/.my.cnf
fi fi
# Install mysql-server # Install mysql-server
if is_oraclelinux; then if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then
install_package mysql-community-server if is_oraclelinux; then
elif is_fedora; then install_package mysql-community-server
install_package mariadb-server mariadb-devel mariadb elif is_fedora; then
sudo systemctl enable $MYSQL_SERVICE_NAME install_package mariadb-server mariadb-devel mariadb
elif is_suse; then sudo systemctl enable $MYSQL_SERVICE_NAME
install_package mariadb-server elif is_suse; then
sudo systemctl enable $MYSQL_SERVICE_NAME install_package mariadb-server
elif is_ubuntu; then sudo systemctl enable $MYSQL_SERVICE_NAME
install_package $MYSQL_SERVICE_NAME-server elif is_ubuntu; then
else install_package $MYSQL_SERVICE_NAME-server
exit_distro_not_supported "mysql installation" else
exit_distro_not_supported "mysql installation"
fi
fi fi
} }

20
lib/databases/postgresql
View File

@ -13,7 +13,7 @@ set +o xtrace
MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-200} MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-200}
INSTALL_DATABASE_SERVER_PACKAGES=$(trueorfalse True INSTALL_DATABASE_SERVER_PACKAGES)
register_database postgresql register_database postgresql
@ -104,15 +104,17 @@ EOF
else else
sed -i "s/:root:\w\+/:root:$DATABASE_PASSWORD/" $pgpass sed -i "s/:root:\w\+/:root:$DATABASE_PASSWORD/" $pgpass
fi fi
if is_ubuntu; then if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then
install_package postgresql if is_ubuntu; then
elif is_fedora || is_suse; then install_package postgresql
install_package postgresql-server elif is_fedora || is_suse; then
if is_fedora; then install_package postgresql-server
sudo systemctl enable postgresql if is_fedora; then
sudo systemctl enable postgresql
fi
else
exit_distro_not_supported "postgresql installation"
fi fi
else
exit_distro_not_supported "postgresql installation"
fi fi
} }