From 7424f8f69a7e19fec6a9994a171d21415395760b Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 1 Feb 2022 03:54:19 -0500 Subject: [PATCH] Remove legacy db pooling variables Change-Id: I54edc22032950f640d824bb8baf170d3599d0f4b --- defaults/main.yml | 7 +++---- .../notes/db-pooling-old-vars-6ad7284cd8583218.yaml | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/db-pooling-old-vars-6ad7284cd8583218.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 309a68e1..cc2e9b3a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -108,12 +108,11 @@ keystone_database_connection_string: >- keystone_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" keystone_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" # Database tuning -# TODO(damiandabrowski): Deprecate following variables in Yoga release: keystone_database_max_pool_size, keystone_database_pool_timeout and keystone_database_idle_timeout keystone_database_enabled: true keystone_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}" -keystone_db_max_pool_size: "{{ openstack_db_max_pool_size | default(keystone_database_max_pool_size) | default('5') }}" -keystone_db_pool_timeout: "{{ openstack_db_pool_timeout | default(keystone_database_pool_timeout) | default('30') }}" -keystone_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default(keystone_database_idle_timeout) | default('600') }}" +keystone_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}" +keystone_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}" +keystone_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}" ## Oslo Messaging keystone_messaging_enabled: true diff --git a/releasenotes/notes/db-pooling-old-vars-6ad7284cd8583218.yaml b/releasenotes/notes/db-pooling-old-vars-6ad7284cd8583218.yaml new file mode 100644 index 00000000..f7dd146a --- /dev/null +++ b/releasenotes/notes/db-pooling-old-vars-6ad7284cd8583218.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + The following keystone role variables were previously deprecated, and + are now removed. Replacement variables were introduced in the Xena release. + ``keystone_database_pool_timeout`` ``keystone_database_max_pool_size`` + ``keystone_database_idle_timeout``