fixes #16: Drop postgresql globals

theforeman · Dec 9, 2019 · de3564f · de3564f
1 parent 0b06117
commit de3564f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git 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
@@ -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'