Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions manifests/application.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion manifests/globals.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
3 changes: 0 additions & 3 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@
# 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,
Stdlib::Host $candlepin_host = 'localhost',
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 {}
1 change: 0 additions & 1 deletion spec/classes/application_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
9 changes: 0 additions & 9 deletions spec/setup_acceptance_node.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
Loading