diff --git a/manifests/application.pp b/manifests/application.pp index 26e6743..075fe5f 100644 --- a/manifests/application.pp +++ b/manifests/application.pp @@ -27,7 +27,6 @@ $candlepin_ca_cert = $certs::ca_cert $candlepin_events_ssl_cert = $certs::foreman::client_cert $candlepin_events_ssl_key = $certs::foreman::client_key - $postgresql_evr_package = $katello::params::postgresql_evr_package $manage_db = $foreman::db_manage # Used in Candlepin @@ -41,12 +40,6 @@ config_file => "${foreman::plugin_config_dir}/katello.yaml", } - if $manage_db { - package { $postgresql_evr_package: - ensure => installed, - } - } - # required by configuration in katello-apache-ssl.conf include apache::mod::setenvif diff --git a/manifests/globals.pp b/manifests/globals.pp index 5fccb10..c5902fa 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -4,5 +4,4 @@ # OAUTH settings $candlepin_oauth_key = 'katello' $candlepin_oauth_secret = extlib::cache_data('foreman_cache_data', 'candlepin_oauth_secret', extlib::random_password(32)) - $postgresql_evr_package = 'postgresql-evr' } diff --git a/manifests/params.pp b/manifests/params.pp index fca5666..fda3e78 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -16,8 +16,6 @@ # The oauth key for Candlepin # @param candlepin_oauth_secret # The oauth secret for Candlepin -# @param postgresql_evr_package -# The contextual package name for the PostgreSQL EVR extension class katello::params ( String[1] $candlepin_oauth_key = $katello::globals::candlepin_oauth_key, String[1] $candlepin_oauth_secret = $katello::globals::candlepin_oauth_secret, @@ -25,6 +23,5 @@ Stdlib::Port $candlepin_port = 23443, Stdlib::HTTPSUrl $candlepin_url = "https://${candlepin_host}:${candlepin_port}/candlepin", String[1] $candlepin_client_keypair_group = 'foreman', - String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package, String[0] $meta_package = 'katello', ) inherits katello::globals {} diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb index f54fdf7..4bf7cca 100644 --- a/spec/classes/application_spec.rb +++ b/spec/classes/application_spec.rb @@ -19,7 +19,6 @@ class { 'katello::params': it { is_expected.to create_package('rubygem-katello') } it { is_expected.not_to create_package('rubygem-katello').that_requires('Anchor[katello::candlepin]') } - it { is_expected.to create_package('postgresql-evr') } it do is_expected.to contain_service('httpd') diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp index 63bba28..da533b8 100644 --- a/spec/setup_acceptance_node.pp +++ b/spec/setup_acceptance_node.pp @@ -16,15 +16,6 @@ ensure => directory, } -# Necessary for PostgreSQL EVR extension -yumrepo { 'pulpcore': - baseurl => "http://yum.theforeman.org/pulpcore/3.39/el\$releasever/\$basearch/", - descr => 'Pulpcore', - enabled => true, - gpgcheck => true, - gpgkey => 'https://yum.theforeman.org/pulpcore/3.39/GPG-RPM-KEY-pulpcore', -} - package { 'glibc-langpack-en': ensure => installed, }