From 023c4f27fc22845d25254cd2debaa566c070d0ea Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 7 Feb 2018 11:37:46 +0000 Subject: [PATCH] Remove placement_database related options/code The placement_database config options were added in Newton but the actual code to use the options was reverted and is not used. Change-Id: Ifb09747056750893e442ebe0b4124e861a70ae55 Related-Reviews: I31293ac4689630e4113588ab2c6373cf572b8f38 Closes-Bug: #1670419 --- defaults/main.yml | 7 ------- .../nova-placement-database-a8735a1df0c4566f.yaml | 15 +++++++++++++++ templates/nova.conf.j2 | 8 -------- tests/test-install-previous-nova.yml | 4 ---- 4 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/nova-placement-database-a8735a1df0c4566f.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 670c52aa..136990e5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -93,13 +93,6 @@ nova_api_db_max_overflow: 10 nova_api_db_max_pool_size: 120 nova_api_db_pool_timeout: 30 -## DB Placement -nova_placement_galera_user: nova_placement -nova_placement_galera_database: nova_placement -nova_placement_db_max_overflow: 10 -nova_placement_db_max_pool_size: 120 -nova_placement_db_pool_timeout: 30 - ## DB Cells nova_cell0_database: "nova_cell0" nova_cell1_name: "cell1" diff --git a/releasenotes/notes/nova-placement-database-a8735a1df0c4566f.yaml b/releasenotes/notes/nova-placement-database-a8735a1df0c4566f.yaml new file mode 100644 index 00000000..77e7c836 --- /dev/null +++ b/releasenotes/notes/nova-placement-database-a8735a1df0c4566f.yaml @@ -0,0 +1,15 @@ +--- +deprecations: + - | + The nova_placement database which was implemented in the ocata release of + OpenStack-Ansible was never actually used for anything due to reverts in + the upstream code. The database should be empty and can be deleted. With + this the following variables also no longer have any function and have + been removed. + + * ``nova_placement_galera_user`` + * ``nova_placement_galera_database`` + * ``nova_placement_db_max_overflow`` + * ``nova_placement_db_max_pool_size`` + * ``nova_placement_db_pool_timeout`` + diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index c7da0edb..381076c1 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -226,14 +226,6 @@ max_overflow = {{ nova_api_db_max_overflow }} max_pool_size = {{ nova_api_db_max_pool_size }} pool_timeout = {{ nova_api_db_pool_timeout }} -{% if nova_placement_service_enabled | bool %} -[placement_database] -connection = mysql+pymysql://{{ nova_placement_galera_user }}:{{ nova_placement_container_mysql_password }}@{{ nova_placement_galera_address }}/{{ nova_placement_galera_database }}?charset=utf8{% if nova_galera_use_ssl | bool %}&ssl_ca={{ nova_galera_ssl_ca_cert }}{% endif %} - -max_overflow = {{ nova_placement_db_max_overflow }} -max_pool_size = {{ nova_placement_db_max_pool_size }} -pool_timeout = {{ nova_placement_db_pool_timeout }} -{% endif %} {% endif %} [oslo_concurrency] diff --git a/tests/test-install-previous-nova.yml b/tests/test-install-previous-nova.yml index efa1b6c4..685c6705 100644 --- a/tests/test-install-previous-nova.yml +++ b/tests/test-install-previous-nova.yml @@ -73,10 +73,6 @@ db_name: "{{ nova_api_galera_database }}" db_password: "{{ nova_api_container_mysql_password }}" - - include: common/previous/create-grant-db.yml - db_name: "{{ nova_placement_galera_database }}" - db_password: "{{ nova_placement_container_mysql_password }}" - - include: common/previous/create-grant-db.yml db_name: "{{ nova_cell0_database }}" db_password: "{{ nova_api_container_mysql_password }}"