Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #16: Drop postgresql globals #26

Merged
merged 1 commit into from
Dec 9, 2019
Merged

fixes #16: Drop postgresql globals #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions manifests/database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
# Set up the PostgreSQL and Redis databases
# @api private
class pulpcore::database {

class { 'postgresql::globals':
version => '10',
client_package_name => 'rh-postgresql10-postgresql-syspaths',
server_package_name => 'rh-postgresql10-postgresql-server-syspaths',
contrib_package_name => 'rh-postgresql10-postgresql-contrib-syspaths',
service_name => 'postgresql',
datadir => '/var/lib/pgsql/data',
confdir => '/var/lib/pgsql/data',
bindir => '/usr/bin',
}

include postgresql::client
include postgresql::server
postgresql::server::db { $pulpcore::postgresql_db_name:
Expand Down
16 changes: 15 additions & 1 deletion spec/acceptance/basic_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
require 'spec_helper_acceptance'

describe 'basic installation' do
let(:pp) { 'include pulpcore' }
let(:pp) {
<<-PUPPET
class { 'postgresql::globals':
version => '10',
client_package_name => 'rh-postgresql10-postgresql-syspaths',
server_package_name => 'rh-postgresql10-postgresql-server-syspaths',
contrib_package_name => 'rh-postgresql10-postgresql-contrib-syspaths',
service_name => 'postgresql',
datadir => '/var/lib/pgsql/data',
confdir => '/var/lib/pgsql/data',
bindir => '/usr/bin',
}
include pulpcore
PUPPET
}

it_behaves_like 'a idempotent resource'

Expand Down