Separate placement database is not deprecated
We can remove the deprecation warning about running the placement database separate since this is now recommended since the placement database will need to be moved out of the nova api database in later releases. Change-Id: Ic009203320c197d54a975a75744e2439eba5b3e4
This commit is contained in:
parent
676c282f79
commit
c495e7fb0c
|
@ -43,11 +43,11 @@
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*placement_database_connection*]
|
# [*placement_database_connection*]
|
||||||
# (optional) Connection url to connect to nova placement database.
|
# (optional) Connection url to connect to placement database.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*placement_slave_connection*]
|
# [*placement_slave_connection*]
|
||||||
# (optional) Connection url to connect to nova placement slave database (read-only).
|
# (optional) Connection url to connect to placement slave database (read-only).
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*database_idle_timeout*]
|
# [*database_idle_timeout*]
|
||||||
|
@ -99,13 +99,6 @@ class nova::db (
|
||||||
include ::nova::deps
|
include ::nova::deps
|
||||||
include ::nova::params
|
include ::nova::params
|
||||||
|
|
||||||
if $placement_database_connection {
|
|
||||||
warning('placement_database_connection has no effect as of pike, and may be removed in a future release')
|
|
||||||
}
|
|
||||||
if $placement_slave_connection {
|
|
||||||
warning('placement_slave_connection has no effect as of pike, and may be removed in a future release')
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
||||||
# to use nova::<myparam> first the nova::db::<myparam>
|
# to use nova::<myparam> first the nova::db::<myparam>
|
||||||
$database_connection_real = pick($::nova::database_connection, $database_connection)
|
$database_connection_real = pick($::nova::database_connection, $database_connection)
|
||||||
|
|
|
@ -26,11 +26,11 @@
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*placement_database_connection*]
|
# [*placement_database_connection*]
|
||||||
# (optional) Connection url for the nova placement database.
|
# (optional) Connection url for the placement database.
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*placement_slave_connection*]
|
# [*placement_slave_connection*]
|
||||||
# (optional) Connection url to connect to nova placement slave database (read-only).
|
# (optional) Connection url to connect to placement slave database (read-only).
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*database_max_retries*]
|
# [*database_max_retries*]
|
||||||
|
|
Loading…
Reference in New Issue