Add PostgreSQL support to devstack
This patch adds an interface for supporting multiple database backend types and implemnts support for PostgreSQL. It also adds a function, use_exclusive_service, which serves as a base for enabling a service that conflicts with other services. The use_database function uses it, and it might also be useful for selecting messaging backends. MySQL is still selected by default. Tested on Fedora 17 and Ubuntu 12.04 with MySQL and PostgreSQL. Implements blueprint postgresql-support Change-Id: I4b1373e25676fd9a9809fe70cb4a6450a2479174
This commit is contained in:
Terry Wilson
@@ -0,0 +1,93 @@
|
||||
# lib/mysql
|
||||
# Functions to control the configuration and operation of the MySQL database backend
|
||||
|
||||
# Dependencies:
|
||||
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
register_database mysql
|
||||
|
||||
function recreate_database_mysql {
|
||||
local db=$1
|
||||
local charset=$2
|
||||
mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -e "DROP DATABASE IF EXISTS $db;"
|
||||
mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -e "CREATE DATABASE $db CHARACTER SET $charset;"
|
||||
}
|
||||
|
||||
function configure_database_mysql {
|
||||
echo_summary "Configuring and starting MySQL"
|
||||
|
||||
if [[ "$os_PACKAGE" = "deb" ]]; then
|
||||
MY_CONF=/etc/mysql/my.cnf
|
||||
MYSQL=mysql
|
||||
else
|
||||
MY_CONF=/etc/my.cnf
|
||||
MYSQL=mysqld
|
||||
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 $DATABASE_PASSWORD || true
|
||||
fi
|
||||
# Update the DB to give user ‘$DATABASE_USER’@’%’ full control of the all databases:
|
||||
sudo mysql -uroot -p$DATABASE_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$DATABASE_USER'@'%' identified by '$DATABASE_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)
|
||||
sudo sed -i '/^bind-address/s/127.0.0.1/0.0.0.0/g' $MY_CONF
|
||||
|
||||
# Set default db type to InnoDB
|
||||
if sudo grep -q "default-storage-engine" $MY_CONF; then
|
||||
# Change it
|
||||
sudo bash -c "source $TOP_DIR/functions; iniset $MY_CONF mysqld default-storage-engine InnoDB"
|
||||
else
|
||||
# Add it
|
||||
sudo sed -i -e "/^\[mysqld\]/ a \
|
||||
default-storage-engine = InnoDB" $MY_CONF
|
||||
fi
|
||||
|
||||
restart_service $MYSQL
|
||||
}
|
||||
|
||||
function install_database_mysql {
|
||||
if [[ "$os_PACKAGE" = "deb" ]]; then
|
||||
# Seed configuration with mysql password so that apt-get install doesn't
|
||||
# prompt us for a password upon install.
|
||||
cat <<MYSQL_PRESEED | sudo debconf-set-selections
|
||||
mysql-server-5.1 mysql-server/root_password password $DATABASE_PASSWORD
|
||||
mysql-server-5.1 mysql-server/root_password_again password $DATABASE_PASSWORD
|
||||
mysql-server-5.1 mysql-server/start_on_boot boolean true
|
||||
MYSQL_PRESEED
|
||||
fi
|
||||
|
||||
# while ``.my.cnf`` is not needed for OpenStack to function, it is useful
|
||||
# as it allows you to access the mysql databases via ``mysql nova`` instead
|
||||
# of having to specify the username/password each time.
|
||||
if [[ ! -e $HOME/.my.cnf ]]; then
|
||||
cat <<EOF >$HOME/.my.cnf
|
||||
[client]
|
||||
user=$DATABASE_USER
|
||||
password=$DATABASE_PASSWORD
|
||||
host=$DATABASE_HOST
|
||||
EOF
|
||||
chmod 0600 $HOME/.my.cnf
|
||||
fi
|
||||
# Install mysql-server
|
||||
install_package mysql-server
|
||||
}
|
||||
|
||||
function database_connection_url_mysql {
|
||||
local output=$1
|
||||
local db=$2
|
||||
eval "$output=$BASE_SQL_CONN/$db?charset=utf8"
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
@@ -0,0 +1,70 @@
|
||||
# lib/postgresql
|
||||
# Functions to control the configuration and operation of the PostgreSQL database backend
|
||||
|
||||
# Dependencies:
|
||||
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
register_database postgresql
|
||||
|
||||
function recreate_database_postgresql {
|
||||
local db=$1
|
||||
local charset=$2
|
||||
# Avoid unsightly error when calling dropdb when the database doesn't exist
|
||||
psql -h$DATABASE_HOST -U$DATABASE_USER -dtemplate1 -c "DROP DATABASE IF EXISTS $db"
|
||||
createdb -h $DATABASE_HOST -U$DATABASE_USER -l C -T template0 -E $charset $db
|
||||
}
|
||||
|
||||
function configure_database_postgresql {
|
||||
echo_summary "Configuring and starting PostgreSQL"
|
||||
if [[ "$os_PACKAGE" = "rpm" ]]; then
|
||||
PG_HBA=/var/lib/pgsql/data/pg_hba.conf
|
||||
PG_CONF=/var/lib/pgsql/data/postgresql.conf
|
||||
else
|
||||
PG_DIR=`find /etc/postgresql -name pg_hba.conf|xargs dirname`
|
||||
PG_HBA=$PG_DIR/pg_hba.conf
|
||||
PG_CONF=$PG_DIR/postgresql.conf
|
||||
fi
|
||||
sudo [ -e /var/lib/pgsql/data ] || sudo postgresql-setup initdb
|
||||
# Listen on all addresses
|
||||
sudo sed -i "/listen_addresses/s/.*/listen_addresses = '*'/" $PG_CONF
|
||||
# Do password auth from all IPv4 clients
|
||||
sudo sed -i "/^host/s/all\s\+127.0.0.1\/32\s\+ident/$DATABASE_USER\t0.0.0.0\/0\tpassword/" $PG_HBA
|
||||
# Do password auth for all IPv6 clients
|
||||
sudo sed -i "/^host/s/all\s\+::1\/128\s\+ident/$DATABASE_USER\t::0\/0\tpassword/" $PG_HBA
|
||||
start_service postgresql
|
||||
|
||||
# If creating the role fails, chances are it already existed. Try to alter it.
|
||||
sudo -u postgres -i psql -c "CREATE ROLE $DATABASE_USER WITH SUPERUSER LOGIN PASSWORD '$DATABASE_PASSWORD'" || \
|
||||
sudo -u postgres -i psql -c "ALTER ROLE $DATABASE_USER WITH SUPERUSER LOGIN PASSWORD '$DATABASE_PASSWORD'"
|
||||
}
|
||||
|
||||
function install_database_postgresql {
|
||||
echo_summary "Installing postgresql"
|
||||
PGPASS=$HOME/.pgpass
|
||||
if [[ ! -e $PGPASS ]]; then
|
||||
cat <<EOF > $PGPASS
|
||||
*:*:*:$DATABASE_USER:$DATABASE_PASSWORD
|
||||
EOF
|
||||
chmod 0600 $PGPASS
|
||||
else
|
||||
sed -i "s/:root:\w\+/:root:$DATABASE_PASSWORD/" $PGPASS
|
||||
fi
|
||||
if [[ "$os_PACKAGE" = "rpm" ]]; then
|
||||
install_package postgresql-server
|
||||
else
|
||||
install_package postgresql
|
||||
fi
|
||||
}
|
||||
|
||||
function database_connection_url_postgresql {
|
||||
local output=$1
|
||||
local db=$2
|
||||
eval "$output=$BASE_SQL_CONN/$db?client_encoding=utf8"
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
Reference in New Issue
Block a user