Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refs #35985 - Rely on theforeman/puppet to do integration #440

Merged
merged 1 commit into from
Feb 20, 2023
+0 −49
Merged

Refs #35985 - Rely on theforeman/puppet to do integration #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ fixtures:
foreman_proxy: "https://github.com/theforeman/puppet-foreman_proxy.git"
foreman: "https://github.com/theforeman/puppet-foreman"
katello: "https://github.com/theforeman/puppet-katello"
puppet: "https://github.com/theforeman/puppet-puppet"
puppetserver_foreman: "https://github.com/theforeman/puppet-puppetserver_foreman"
tftp: "https://github.com/theforeman/puppet-tftp"
xinetd: "https://github.com/puppetlabs/puppetlabs-xinetd"
certs: "https://github.com/theforeman/puppet-certs.git"
Expand Down
17 changes: 0 additions & 17 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#
# === Advanced parameters:
#
# $puppet:: Enable puppet
#
# $reverse_proxy:: Add reverse proxy to the parent
#
# $reverse_proxy_port:: Reverse proxy listening port
Expand Down Expand Up @@ -101,8 +99,6 @@
class foreman_proxy_content (
Boolean $pulpcore_mirror = false,

Boolean $puppet = false,

Boolean $reverse_proxy = false,
Stdlib::Port $reverse_proxy_port = 8443,

Expand Down Expand Up @@ -397,17 +393,4 @@
Pulpcore::Plugin <| |> ~> Foreman_smartproxy[$foreman_proxy::registered_name]
}
# lint:endignore

if $puppet {
# We can't pull the certs out to the top level, because of how it gets the default
# parameter values from the main certs class. Kafo can't handle that case, so
# it remains here for now.
include puppet
if $puppet::server and $puppet::server::foreman {
class { 'certs::puppet':
hostname => $certs::foreman_proxy::hostname,
before => Class['puppet::server::config'],
}
}
}
}
30 changes: 0 additions & 30 deletions spec/classes/foreman_proxy_content_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,36 +219,6 @@
end
end

context 'with puppet' do
let(:params) do
{
puppet: true,
}
end

describe 'with puppet server enabled' do
let(:pre_condition) do
<<-PUPPET
class { 'puppet':
server => true,
server_foreman => true,
}
PUPPET
end

it { is_expected.to compile.with_all_deps }
it do
is_expected.to contain_class('certs::puppet')
.that_comes_before(['Class[puppet::server::config]', 'Class[puppetserver_foreman]'])
end
end

describe 'with puppet server disabled' do
it { is_expected.to compile.with_all_deps }
it { is_expected.not_to contain_class('certs::puppet') }
end
end

context 'with registration_url' do
let(:params) do
{
Expand Down