From d736c640722c6c3fd419c6da5edf7c698b8fcd3f Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 1 Feb 2022 04:20:36 -0500
Subject: [PATCH] Remove legacy db pooling variables
Change-Id: I7f7e9a5a4a12afff994f548abff2482818a43ccb
---
defaults/main.yml | 3 +--
releasenotes/notes/db-pooling-old-vars-0fca50f8114ab7bb.yaml | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 releasenotes/notes/db-pooling-old-vars-0fca50f8114ab7bb.yaml
diff --git a/defaults/main.yml b/defaults/main.yml
index 4207a573..8c948d20 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -71,8 +71,7 @@ octavia_galera_database: octavia
octavia_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
octavia_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}"
octavia_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}"
-# TODO(damiandabrowski): Remove octavia_db_pool_size in Yoga release
-octavia_db_max_pool_size: "{{ openstack_db_max_pool_size | default(octavia_db_pool_size | default('5')) }}"
+octavia_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}"
octavia_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}"
octavia_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}"
octavia_galera_port: "{{ galera_port | default('3306') }}"
diff --git a/releasenotes/notes/db-pooling-old-vars-0fca50f8114ab7bb.yaml b/releasenotes/notes/db-pooling-old-vars-0fca50f8114ab7bb.yaml
new file mode 100644
index 00000000..974051d3
--- /dev/null
+++ b/releasenotes/notes/db-pooling-old-vars-0fca50f8114ab7bb.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The ``octaiva_db_pool_size`` variable was previously deprecated and is now
+ removed. A replacement variable was introduced in the Xena release.