starlingx/stx-puppet
Code Issues Proposed changes

Merge "Removed deprecated parameter on puppet-fm and puppet-sysinv"

Browse Source
This commit is contained in:
Zuul 2022-05-02 17:15:53 +00:00 committed by Gerrit Code Review
commit 81abafbce9
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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