starlingx
/
config
Code Issues Proposed changes

Renaming deprecated options and updating spec requirements 

- Renaming idle_timeout to connection_recycle_time since it was
  deprecated in Stein
- Explicitly including required packages in the sysinv spec file to fix
  DC

Change-Id: Ief055d26f3a1eb43b8cf144952a49e7e0f3ff939
Story: 2004765
Task: 28883
Depends-On: https://review.openstack.org/#/c/653086
Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
This commit is contained in:
Tyler Smith 2019-04-16 14:46:38 -04:00
parent e7fae38bed
commit 43381a8748
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllerconfig/centos/controllerconfig.spec
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

8
puppet-modules-wrs/puppet-dcmanager/src/dcmanager/manifests/init.pp
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 {

8
puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/init.pp
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 {

8
puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp
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 {

8
puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
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 {