From 43381a8748cde511054a79d215943f2a7e5949f3 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler.smith@windriver.com>
Date: Tue, 16 Apr 2019 14:46:38 -0400
Subject: [PATCH] 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>
---
 controllerconfig/centos/controllerconfig.spec             | 2 ++
 .../puppet-dcmanager/src/dcmanager/manifests/init.pp      | 8 ++++----
 .../puppet-dcorch/src/dcorch/manifests/init.pp            | 8 ++++----
 puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp     | 8 ++++----
 .../puppet-sysinv/src/sysinv/manifests/init.pp            | 8 ++++----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/controllerconfig/centos/controllerconfig.spec b/controllerconfig/centos/controllerconfig.spec
index 4b0b23d3bb..d42350c877 100644
--- a/controllerconfig/centos/controllerconfig.spec
+++ b/controllerconfig/centos/controllerconfig.spec
@@ -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
diff --git a/puppet-modules-wrs/puppet-dcmanager/src/dcmanager/manifests/init.pp b/puppet-modules-wrs/puppet-dcmanager/src/dcmanager/manifests/init.pp
index 995d60f298..c692cb4766 100644
--- a/puppet-modules-wrs/puppet-dcmanager/src/dcmanager/manifests/init.pp
+++ b/puppet-modules-wrs/puppet-dcmanager/src/dcmanager/manifests/init.pp
@@ -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 {
diff --git a/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/init.pp b/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/init.pp
index 87a4059827..b2d3987e39 100644
--- a/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/init.pp
+++ b/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/init.pp
@@ -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 {
diff --git a/puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp b/puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp
index b2958c933f..2f63292b8c 100644
--- a/puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp
+++ b/puppet-modules-wrs/puppet-fm/src/fm/manifests/init.pp
@@ -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 {
diff --git a/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp b/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
index 2a719d82c3..c6460528ba 100644
--- a/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
+++ b/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
@@ -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 {