starlingx/stx-puppet
Code Issues Proposed changes

Removed deprecated parameter on puppet-fm and puppet-sysinv

Browse Source 
The following warning was given during bootstrap on debian:

"The password_hash parameter was deprecated and will be removed"

For that reason, password_hash parameter was switched to password.

The parameter got deprecated cause Debian is using a newer version of
the module:
https://docs.openstack.org/releasenotes/puppet-openstacklib/
victoria.html#deprecation-notes


Test Plan:

PASS: Build & install
PASS: Successful Bootstrap and unlock on Debian
PASS: Successful Bootstrap and unlock on the latest
version on Debian
PASS: Build & install on centOS
PASS: Successful Bootstrap and unlock on centOS

Story: 2009101
Task: 44981

Signed-off-by: lbonatti <LuizEduardo.Bonatti@windriver.com>
Change-Id: I99e500d41ae53c04973a3bcbacf9969b34b5938a
This commit is contained in:
lbonatti 2022-03-29 16:44:48 -03:00 committed by Luis Eduardo Bonatti
parent 7ef1065554
commit 92518afadf
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/puppet-fm/src/fm/manifests/db/postgresql.pp
View File

@ -42,12 +42,22 @@ class fm::db::postgresql(
include ::fm::deps
::openstacklib::db::postgresql { 'fm':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
if $::osfamily == 'Debian' {
::openstacklib::db::postgresql { 'fm':
password => $password,
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
}
} else {
::openstacklib::db::postgresql { 'fm':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
}
}
Anchor['fm::db::begin']

22
modules/puppet-sysinv/src/sysinv/manifests/db/postgresql.pp
View File

@ -46,12 +46,22 @@ class sysinv::db::postgresql(
$privileges = 'ALL',
) {
::openstacklib::db::postgresql { 'sysinv':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
if $::osfamily == 'Debian' {
::openstacklib::db::postgresql { 'sysinv':
password => $password,
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
}
} else {
::openstacklib::db::postgresql { 'sysinv':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
}
}
::Openstacklib::Db::Postgresql['sysinv'] ~> Service <| title == 'sysinv-api' |>