From 65016f288325f38e4259a162820160f102904923 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 1 Feb 2022 04:17:09 -0500 Subject: [PATCH] Remove legacy db pooling variables Change-Id: Ie04bea4468c9fe789195857d9d47a02470cda6e3 --- defaults/main.yml | 3 +-- releasenotes/notes/db-pooling-old-vars-b5dbab9bfb21cc78.yaml | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/db-pooling-old-vars-b5dbab9bfb21cc78.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 7376c369..05d7fb36 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -218,8 +218,7 @@ neutron_galera_address: "{{ galera_address | default('127.0.0.1') }}" neutron_galera_user: neutron neutron_galera_database: neutron neutron_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}" -# TODO(damiandabrowski): Remove neutron_db_pool_size in Yoga release -neutron_db_max_pool_size: "{{ openstack_db_max_pool_size | default(neutron_db_pool_size) | default('5') }}" +neutron_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}" neutron_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}" neutron_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}" neutron_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" diff --git a/releasenotes/notes/db-pooling-old-vars-b5dbab9bfb21cc78.yaml b/releasenotes/notes/db-pooling-old-vars-b5dbab9bfb21cc78.yaml new file mode 100644 index 00000000..1064a108 --- /dev/null +++ b/releasenotes/notes/db-pooling-old-vars-b5dbab9bfb21cc78.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``neutron_db_pool_size`` variable was previously deprecated and is now + removed. A replacement variable was introduced in the Xena release.