Skip to content

Commit 2f2078a

Browse files
sjha4ekohl
authored andcommitted
Fixes #37680 - Stop installing postgresql_evr extension
1 parent 62919f0 commit 2f2078a

File tree

5 files changed

+0
-21
lines changed

5 files changed

+0
-21
lines changed

manifests/application.pp

-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
$candlepin_ca_cert = $certs::ca_cert
2828
$candlepin_events_ssl_cert = $certs::foreman::client_cert
2929
$candlepin_events_ssl_key = $certs::foreman::client_key
30-
$postgresql_evr_package = $katello::params::postgresql_evr_package
3130
$manage_db = $foreman::db_manage
3231

3332
# Used in Candlepin
@@ -41,12 +40,6 @@
4140
config_file => "${foreman::plugin_config_dir}/katello.yaml",
4241
}
4342

44-
if $manage_db {
45-
package { $postgresql_evr_package:
46-
ensure => installed,
47-
}
48-
}
49-
5043
# required by configuration in katello-apache-ssl.conf
5144
include apache::mod::setenvif
5245

manifests/globals.pp

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44
# OAUTH settings
55
$candlepin_oauth_key = 'katello'
66
$candlepin_oauth_secret = extlib::cache_data('foreman_cache_data', 'candlepin_oauth_secret', extlib::random_password(32))
7-
$postgresql_evr_package = 'postgresql-evr'
87
}

manifests/params.pp

-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@
1616
# The oauth key for Candlepin
1717
# @param candlepin_oauth_secret
1818
# The oauth secret for Candlepin
19-
# @param postgresql_evr_package
20-
# The contextual package name for the PostgreSQL EVR extension
2119
class katello::params (
2220
String[1] $candlepin_oauth_key = $katello::globals::candlepin_oauth_key,
2321
String[1] $candlepin_oauth_secret = $katello::globals::candlepin_oauth_secret,
2422
Stdlib::Host $candlepin_host = 'localhost',
2523
Stdlib::Port $candlepin_port = 23443,
2624
Stdlib::HTTPSUrl $candlepin_url = "https://${candlepin_host}:${candlepin_port}/candlepin",
2725
String[1] $candlepin_client_keypair_group = 'foreman',
28-
String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package,
2926
String[0] $meta_package = 'katello',
3027
) inherits katello::globals {}

spec/classes/application_spec.rb

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class { 'katello::params':
1919

2020
it { is_expected.to create_package('rubygem-katello') }
2121
it { is_expected.not_to create_package('rubygem-katello').that_requires('Anchor[katello::candlepin]') }
22-
it { is_expected.to create_package('postgresql-evr') }
2322

2423
it do
2524
is_expected.to contain_service('httpd')

spec/setup_acceptance_node.pp

-9
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616
ensure => directory,
1717
}
1818

19-
# Necessary for PostgreSQL EVR extension
20-
yumrepo { 'pulpcore':
21-
baseurl => "http://yum.theforeman.org/pulpcore/3.39/el\$releasever/\$basearch/",
22-
descr => 'Pulpcore',
23-
enabled => true,
24-
gpgcheck => true,
25-
gpgkey => 'https://yum.theforeman.org/pulpcore/3.39/GPG-RPM-KEY-pulpcore',
26-
}
27-
2819
package { 'glibc-langpack-en':
2920
ensure => installed,
3021
}

0 commit comments

Comments
 (0)