From c495e7fb0c08f4b3500b1518a95eae9e62c6f501 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 26 Sep 2018 20:46:49 +0200 Subject: [PATCH] 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 --- manifests/db.pp | 11 ++--------- manifests/init.pp | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index 501a0d1a2..ffc4393c9 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -43,11 +43,11 @@ # Defaults to $::os_service_default # # [*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 # # [*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 # # [*database_idle_timeout*] @@ -99,13 +99,6 @@ class nova::db ( include ::nova::deps 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 # to use nova:: first the nova::db:: $database_connection_real = pick($::nova::database_connection, $database_connection) diff --git a/manifests/init.pp b/manifests/init.pp index dfb7920e4..071fec95e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,11 +26,11 @@ # Defaults to undef. # # [*placement_database_connection*] -# (optional) Connection url for the nova placement database. +# (optional) Connection url for the placement database. # Defaults to undef. # # [*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. # # [*database_max_retries*]