Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions manifests/database/postgresql.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@
}

include postgresql::client, postgresql::server

if $facts['os']['family'] == 'RedHat' {
stdlib::ensure_packages(['glibc-langpack-en'])
Package['glibc-langpack-en'] -> Postgresql::Server::Db[$foreman::db_database]
}
include foreman::database::postgresql::encoding

postgresql::server::db { $foreman::db_database:
user => $foreman::db_username,
password => postgresql::postgresql_password($foreman::db_username, $foreman::db_password),
owner => $foreman::db_username,
encoding => 'utf8',
locale => 'en_US.utf8',
require => Class['foreman::database::postgresql::encoding'],
}
}
7 changes: 7 additions & 0 deletions manifests/database/postgresql/encoding.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# @summary Class to ensure the packages for encoding are installed
# @api private
class foreman::database::postgresql::encoding {
if $facts['os']['family'] == 'RedHat' {
stdlib::ensure_packages(['glibc-langpack-en'])
}
}
10 changes: 8 additions & 2 deletions spec/classes/foreman_database_spec.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
require 'spec_helper'

describe 'foreman' do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let(:facts) { facts }
let(:facts) { os_facts }
let(:params) { {} }

if os_facts[:os]['family'] == 'RedHat'
it { should contain_package('glibc-langpack-en').that_comes_before('Postgresql::Server::Db[foreman]') }
else
it { should_not contain_package('glibc-langpack-en') }
end

describe 'with db_manage set to false' do
let(:params) { super().merge(db_manage: false) }

Expand Down
Loading