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
This commit is contained in:
Jesse Pretorius 2018-02-07 11:37:46 +00:00
parent 0a3ce61166
commit 023c4f27fc
4 changed files with 15 additions and 19 deletions

View File

@ -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"

View File

@ -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``

View File

@ -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]

View File

@ -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 }}"