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
lib/databases
mysqlpostgresql

3
lib/databases/mysql

@ -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,6 +176,7 @@ EOF
chmod 0600 $HOME/.my.cnf chmod 0600 $HOME/.my.cnf
fi fi
# Install mysql-server # Install mysql-server
if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then
if is_oraclelinux; then if is_oraclelinux; then
install_package mysql-community-server install_package mysql-community-server
elif is_fedora; then elif is_fedora; then
@ -188,6 +190,7 @@ EOF
else else
exit_distro_not_supported "mysql installation" exit_distro_not_supported "mysql installation"
fi fi
fi
} }
function install_database_python_mysql { function install_database_python_mysql {

4
lib/databases/postgresql

@ -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,6 +104,7 @@ EOF
else else
sed -i "s/:root:\w\+/:root:$DATABASE_PASSWORD/" $pgpass sed -i "s/:root:\w\+/:root:$DATABASE_PASSWORD/" $pgpass
fi fi
if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then
if is_ubuntu; then if is_ubuntu; then
install_package postgresql install_package postgresql
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
@ -114,6 +115,7 @@ EOF
else else
exit_distro_not_supported "postgresql installation" exit_distro_not_supported "postgresql installation"
fi fi
fi
} }
function install_database_python_postgresql { function install_database_python_postgresql {