Merge "Renaming deprecated options and updating spec requirements"

This commit is contained in:
Zuul 2019-04-22 22:14:48 +00:00 committed by Gerrit Code Review
commit da8096b352
5 changed files with 18 additions and 16 deletions

View File

@ -19,6 +19,8 @@ Requires: python-iso8601
Requires: psmisc
Requires: python-pyudev
Requires: python-netifaces
Requires: python2-crypto
Requires: python2-pysnmp
%description
Controller node configuration

View File

@ -77,10 +77,10 @@ class dcmanager (
$real_connection = regsubst($database_connection,'^postgresql:','postgresql+psycopg2:')
dcmanager_config {
'database/connection': value => $real_connection, secret => true;
'database/idle_timeout': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
'database/connection': value => $real_connection, secret => true;
'database/connection_recycle_time': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
}
if $use_syslog {

View File

@ -104,10 +104,10 @@ class dcorch (
$real_connection = regsubst($database_connection,'^postgresql:','postgresql+psycopg2:')
dcorch_config {
'database/connection': value => $real_connection, secret => true;
'database/idle_timeout': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
'database/connection': value => $real_connection, secret => true;
'database/connection_recycle_time': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
}
if $use_syslog {

View File

@ -95,10 +95,10 @@ class fm (
# Automatically add psycopg2 driver to postgresql (only does this if it is missing)
$real_connection = regsubst($database_connection,'^postgresql:','postgresql+psycopg2:')
fm_config {
'database/connection': value => $real_connection, secret => true;
'database/idle_timeout': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
'database/connection': value => $real_connection, secret => true;
'database/connection_recycle_time': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
}
fm_config {

View File

@ -166,10 +166,10 @@ class sysinv (
$real_connection = regsubst($database_connection,'^postgresql:','postgresql+psycopg2:')
sysinv_config {
'database/connection': value => $real_connection, secret => true;
'database/idle_timeout': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
'database/connection': value => $real_connection, secret => true;
'database/connection_recycle_time': value => $database_idle_timeout;
'database/max_pool_size': value => $database_max_pool_size;
'database/max_overflow': value => $database_max_overflow;
}
sysinv_config {