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

Add proxy_pulp_deb_to_pulpcore parameter #296

Closed
wants to merge 1 commit into from
Closed

Add proxy_pulp_deb_to_pulpcore parameter #296

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
7 changes: 7 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
#
# $pulp_ca_cert:: Absolute path to PEM encoded CA certificate file, used by Pulp to validate the identity of the broker using SSL.
#
# $proxy_pulp_deb_to_pulpcore:: Proxy /pulp/deb to Pulpcore at /pulp/content
#
# $proxy_pulp_isos_to_pulpcore:: Proxy /pulp/isos to Pulpcore at /pulp/content
#
# $proxy_pulp_yum_to_pulpcore:: Proxy /pulp/yum to Pulpcore at /pulp/content
Expand Down Expand Up @@ -150,6 +152,7 @@
Boolean $enable_ostree = $foreman_proxy_content::params::enable_ostree,
Boolean $enable_yum = $foreman_proxy_content::params::enable_yum,
Boolean $enable_file = $foreman_proxy_content::params::enable_file,
Boolean $proxy_pulp_deb_to_pulpcore = $foreman_proxy_content::params::proxy_pulp_deb_to_pulpcore,
Boolean $proxy_pulp_isos_to_pulpcore = $foreman_proxy_content::params::proxy_pulp_isos_to_pulpcore,
Boolean $proxy_pulp_yum_to_pulpcore = $foreman_proxy_content::params::proxy_pulp_yum_to_pulpcore,
Boolean $enable_puppet = $foreman_proxy_content::params::enable_puppet,
Expand Down Expand Up @@ -180,6 +183,7 @@
$pulpcore_mirror = $foreman_proxy::plugin::pulp::pulpcore_mirror
$pulpcore = $foreman_proxy::plugin::pulp::pulpcore_enabled

$enable_pulp2_deb = $enable_deb and !($pulpcore and $proxy_pulp_deb_to_pulpcore)
$enable_pulp2_rpm = $enable_yum and !($pulpcore and $proxy_pulp_yum_to_pulpcore)
$enable_pulp2_iso = $enable_file and !($pulpcore and $proxy_pulp_isos_to_pulpcore)

Expand Down Expand Up @@ -410,6 +414,9 @@
}

include pulpcore::plugin::container
class { 'pulpcore::plugin::deb':
use_pulp2_content_route => $proxy_pulp_deb_to_pulpcore,
}
class { 'pulpcore::plugin::file':
use_pulp2_content_route => $proxy_pulp_isos_to_pulpcore,
}
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
$enable_ostree = false
$enable_yum = true
$enable_file = true
$proxy_pulp_deb_to_pulpcore = true
$proxy_pulp_isos_to_pulpcore = true
$proxy_pulp_yum_to_pulpcore = true
$enable_puppet = true
Expand Down