From ac9e5bd6fe9ba3e5f930339922f7e2630e9662bd Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Fri, 6 Dec 2019 13:24:09 -0500 Subject: [PATCH] fixes #16: Drop postgresql globals --- manifests/database.pp | 12 ------------ spec/acceptance/basic_spec.rb | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/manifests/database.pp b/manifests/database.pp index e5bdff25..c754b11b 100644 --- a/manifests/database.pp +++ b/manifests/database.pp @@ -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: diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index 1f98c07e..8c460603 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -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'