Skip to content

Refs #28961: Disable Crane when Pulp 3 is serving container content #239

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

Closed
ehelms wants to merge 1 commit into from
Closed

Refs #28961: Disable Crane when Pulp 3 is serving container content #239

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
20 changes: 12 additions & 8 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
#
# $proxy_pulp_isos_to_pulpcore:: Proxy /pulp/isos to pulpcore at /pulp/content
#
# $proxy_pulp_container_to_pulpcore:: Disable Crane so that Pulp 3 serves container content
#
# $reverse_proxy:: Add reverse proxy to the parent
#
# $reverse_proxy_port:: Reverse proxy listening port
Expand Down Expand Up @@ -216,14 +218,16 @@
}
}

include certs::apache
class { 'pulp::crane':
cert => $certs::apache::apache_cert,
key => $certs::apache::apache_key,
ca_cert => $certs::katello_server_ca_cert,
data_dir => '/var/lib/pulp/published/docker/v2/app',
ssl_protocol => $ssl_protocol,
require => Class['certs::apache'],
if !$proxy_pulp_container_to_pulpcore {
Copy link
Member

@ekohl ekohl Mar 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if !$proxy_pulp_container_to_pulpcore {
unless $proxy_pulp_container_to_pulpcore {

include certs::apache
class { 'pulp::crane':
cert => $certs::apache::apache_cert,
key => $certs::apache::apache_key,
ca_cert => $certs::katello_server_ca_cert,
data_dir => '/var/lib/pulp/published/docker/v2/app',
ssl_protocol => $ssl_protocol,
require => Class['certs::apache'],
}
}

include foreman_proxy_content::pub_dir
Expand Down