Skip to content

Commit 168ca7f

Browse files
committed
Remove deprecated PostgreSQL database driver
This was deprecated for removal in Pike. It's probably time to drop it. Note that the 'postgresql-devel'/'postgresql-server-dev-all' packages are retained since some packages still include 'psycopg2' in their general requirements. Change-Id: I51e8354e99972757253ce259e6c03c91da24398c Signed-off-by: Stephen Finucane <[email protected]>
1 parent 6926ed8 commit 168ca7f

6 files changed

Lines changed: 14 additions & 166 deletions

File tree

doc/source/configuration.rst

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -326,29 +326,23 @@ a file, keep service logs and disable color in the stored files.
326326
Database Backend
327327
----------------
328328

329-
Multiple database backends are available. The available databases are defined
330-
in the lib/databases directory.
331-
``mysql`` is the default database, choose a different one by putting the
332-
following in the ``localrc`` section::
329+
Support for the MySQL database backend is included. Addition database backends
330+
may be available via external plugins. Enabling of disabling MySQL is handled
331+
via the usual service functions and ``ENABLED_SERVICES``. For example, to
332+
disable MySQL in ``local.conf``::
333333

334334
disable_service mysql
335-
enable_service postgresql
336-
337-
``mysql`` is the default database.
338335

339336
RPC Backend
340337
-----------
341338

342-
Support for a RabbitMQ RPC backend is included. Additional RPC
343-
backends may be available via external plugins. Enabling or disabling
344-
RabbitMQ is handled via the usual service functions and
345-
``ENABLED_SERVICES``.
346-
347-
Example disabling RabbitMQ in ``local.conf``::
339+
Support for a RabbitMQ RPC backend is included. Additional RPC backends may be
340+
available via external plugins. Enabling or disabling RabbitMQ is handled via
341+
the usual service functions and ``ENABLED_SERVICES``. For example, to disable
342+
RabbitMQ in ``local.conf``::
348343

349344
disable_service rabbit
350345

351-
352346
Apache Frontend
353347
---------------
354348

doc/source/zuul_ci_jobs_migration.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,7 @@ migrated at all.
302302
- This will probably be implemented on ironic side.
303303
* - DEVSTACK_GATE_POSTGRES
304304
- Legacy
305-
- This flag exists in d-g but the only thing that it does is
306-
capture postgres logs. This is already supported by the roles
307-
in post, so the flag is useless in the new jobs. postgres
308-
itself can be enabled via the devstack_service job variable.
305+
- This has no effect in d-g.
309306
* - DEVSTACK_GATE_ZEROMQ
310307
- Legacy
311308
- This has no effect in d-g.

functions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,8 @@ function upload_image {
400400
# initialized yet, just save the configuration selection and call back later
401401
# to validate it.
402402
#
403-
# ``$1`` - the name of the database backend to use (mysql, postgresql, ...)
403+
# ``$1`` - the name of the database backend to use (only mysql is currently
404+
# supported)
404405
function use_database {
405406
if [[ -z "$DATABASE_BACKENDS" ]]; then
406407
# No backends registered means this is likely called from ``localrc``

lib/databases/postgresql

Lines changed: 0 additions & 137 deletions
This file was deleted.

stack.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -695,14 +695,11 @@ function read_password {
695695
# Database Configuration
696696
# ----------------------
697697

698-
# To select between database backends, add the following to ``local.conf``:
698+
# DevStack provides a MySQL database backend. Additional backends may be
699+
# provided by external plugins and can be enabled using the usual service
700+
# functions and ``ENABLED_SERVICES``. For example, to disable MySQL:
699701
#
700702
# disable_service mysql
701-
# enable_service postgresql
702-
#
703-
# The available database backends are listed in ``DATABASE_BACKENDS`` after
704-
# ``lib/database`` is sourced. ``mysql`` is the default.
705-
706703
if initialize_database_backends; then
707704
echo "Using $DATABASE_TYPE database backend"
708705
# Last chance for the database password. This must be handled here

unstack.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ if [[ -n "$UNSTACK_ALL" ]]; then
147147
stop_service mysql
148148
fi
149149

150-
if is_service_enabled postgresql; then
151-
stop_service postgresql
152-
fi
153-
154150
# Stop rabbitmq-server
155151
if is_service_enabled rabbit; then
156152
stop_service rabbitmq-server

0 commit comments

Comments
 (0)