Skip to content

Commit

Permalink
Refs #35985 - Rely on theforeman/puppet to do integration
Browse files Browse the repository at this point in the history
The integration is moved into theforeman/puppet so this is no longer
needed.
  • Loading branch information
ekohl committed Jan 27, 2023
1 parent 03e84fe commit 04b49f7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
2 changes: 0 additions & 2 deletions .fixtures.yml
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
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 @@ -383,17 +379,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'],
}
}
}
}

0 comments on commit 04b49f7

Please sign in to comment.