diff --git a/manifests/broker.pp b/manifests/broker.pp
deleted file mode 100644
index 68d709d6..00000000
--- a/manifests/broker.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# @summary Manages a standalone qpid broker for pulp
-#
-# In Katello, the master pulp instance uses Katello's main qpid message broker.
-# This can be used for a separate pulp instance that also needs a broker of its
-# own.
-#
-# @param interface
-# The interface the broker listens on
-class foreman_proxy_content::broker (
- String $interface = 'lo',
-) {
- include certs::qpid
-
- class { 'qpid':
- ssl => true,
- ssl_cert_db => $certs::nss_db_dir,
- ssl_cert_password_file => $certs::qpid::nss_db_password_file,
- ssl_cert_name => 'broker',
- interface => $interface,
- subscribe => Class['certs', 'certs::qpid'],
- }
-}
diff --git a/manifests/dispatch_router.pp b/manifests/dispatch_router.pp
deleted file mode 100644
index 1d82a7e2..00000000
--- a/manifests/dispatch_router.pp
+++ /dev/null
@@ -1,78 +0,0 @@
-# @summary Install and configure Qpid Dispatch Router
-#
-# @param agent_addr
-# Listener address for goferd agents
-#
-# @param agent_port
-# Listener port for goferd agents
-#
-# @param logging_level
-# Logging level of dispatch router (e.g. info+ or debug+)
-#
-# @param logging
-# Whether to log to file or syslog.
-#
-# @param logging_path
-# Directory for dispatch router logs, if using file logging
-#
-# @param ssl_ciphers
-# SSL Ciphers to support in dispatch router
-#
-# @param ssl_protocols
-# Protocols to support in dispatch router (e.g. TLSv1.2, etc)
-class foreman_proxy_content::dispatch_router (
- Optional[Stdlib::Host] $agent_addr = undef,
- Stdlib::Port $agent_port = 5647,
-
- Optional[String] $ssl_ciphers = undef,
- Optional[Array[String]] $ssl_protocols = undef,
-
- String $logging_level = 'info+',
- Enum['file', 'syslog'] $logging = 'syslog',
- Stdlib::Absolutepath $logging_path = '/var/log/qdrouterd',
-) {
-
- contain qpid::router
-
- # SSL Certificate Configuration
- class { 'certs::qpid_router':
- require => Class['qpid::router::install'],
- }
- ~> qpid::router::ssl_profile { 'client':
- ca => $certs::ca_cert,
- cert => $certs::qpid_router::client_cert,
- key => $certs::qpid_router::client_key,
- }
- ~> qpid::router::ssl_profile { 'server':
- ca => $certs::ca_cert,
- cert => $certs::qpid_router::server_cert,
- key => $certs::qpid_router::server_key,
- ciphers => $ssl_ciphers,
- protocols => $ssl_protocols,
- }
-
- # Listen for katello-agent clients
- qpid::router::listener { 'clients':
- host => $agent_addr,
- port => $agent_port,
- ssl_profile => 'server',
- }
-
- # Enable logging to syslog or file
- if $logging == 'file' {
- file { $logging_path:
- ensure => directory,
- owner => 'qdrouterd',
- }
- }
-
- $output_real = $logging ? {
- 'file' => "${logging_path}/qdrouterd.log",
- 'syslog' => 'syslog',
- }
-
- qpid::router::log { 'logging':
- level => $logging_level,
- output => $output_real,
- }
-}
diff --git a/manifests/dispatch_router/connector.pp b/manifests/dispatch_router/connector.pp
deleted file mode 100644
index d9c5f862..00000000
--- a/manifests/dispatch_router/connector.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# @summary Configure qpid router to connect to a hub
-#
-# @param host
-# The host to connect to
-# @param port
-# The port to connect to
-#
-class foreman_proxy_content::dispatch_router::connector (
- Stdlib::Host $host,
- Stdlib::Port $port = 5646,
-) {
- include foreman_proxy_content::dispatch_router
-
- qpid::router::connector { 'hub':
- host => $host,
- port => $port,
- ssl_profile => 'client',
- role => 'inter-router',
- idle_timeout => 0,
- }
-
- qpid::router::link_route { 'hub-pulp-route-in':
- prefix => 'pulp.',
- direction => 'in',
- }
-
- qpid::router::link_route { 'hub-pulp-route-out':
- prefix => 'pulp.',
- direction => 'out',
- }
-
- qpid::router::link_route { 'hub-qmf-route-in':
- prefix => 'qmf.',
- direction => 'in',
- }
-
- qpid::router::link_route { 'hub-qmf-route-out':
- prefix => 'qmf.',
- direction => 'out',
- }
-}
diff --git a/manifests/dispatch_router/hub.pp b/manifests/dispatch_router/hub.pp
deleted file mode 100644
index 2136e196..00000000
--- a/manifests/dispatch_router/hub.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# @summary Configure qpid router to listen as a hub
-#
-# @param hub_addr
-# Address to listen on
-#
-# @param hub_port
-# Port to listen on
-#
-# @param broker_addr
-# Address of qpidd broker to connect to
-#
-# @param broker_port
-# Port of qpidd broker to connect to
-#
-# @param sasl_mech
-# SASL mechanism to be used from router to broker
-#
-# @param sasl_username
-# SASL username to be used from router to broker
-#
-# @param sasl_password
-# SASL password to be used from router to broker
-class foreman_proxy_content::dispatch_router::hub (
- Optional[String] $hub_addr = undef,
- Stdlib::Port $hub_port = 5646,
- String $broker_addr = undef,
- Stdlib::Port $broker_port = 5671,
- String $sasl_mech = 'PLAIN',
- String $sasl_username = 'katello_agent',
- String $sasl_password = extlib::cache_data('foreman_cache_data', 'qpid_router_sasl_password', extlib::random_password(16)),
-) {
- include foreman_proxy_content::dispatch_router
-
- qpid::router::listener {'hub':
- host => $hub_addr,
- port => $hub_port,
- role => 'inter-router',
- ssl_profile => 'server',
- }
-
- # Connect dispatch router to the local qpid
- qpid::router::connector { 'broker':
- host => $broker_addr,
- port => $broker_port,
- sasl_mech => $sasl_mech,
- sasl_username => $sasl_username,
- sasl_password => $sasl_password,
- ssl_profile => 'client',
- role => 'route-container',
- idle_timeout => 0,
- }
-
- qpid::router::link_route { 'broker-pulp-route-out':
- prefix => 'pulp.',
- direction => 'out',
- connection => 'broker',
- }
-
- qpid::router::link_route { 'broker-pulp-task-route-in':
- prefix => 'pulp.task',
- direction => 'in',
- connection => 'broker',
- }
-
- qpid::router::link_route { 'broker-qmf-route-in':
- prefix => 'qmf.',
- connection => 'broker',
- direction => 'in',
- }
-
- qpid::router::link_route { 'broker-qmf-route-out':
- prefix => 'qmf.',
- connection => 'broker',
- direction => 'out',
- }
-}
diff --git a/manifests/init.pp b/manifests/init.pp
index 5e1b2864..651894c9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,90 +2,16 @@
#
# Configure content for foreman proxy for use by katello
#
-# === Parameters:
-#
-# $parent_fqdn:: FQDN of the parent node.
-#
-# $enable_ostree:: Enable ostree content plugin, this requires an ostree install
-#
-# $enable_yum:: Enable rpm content plugin, including syncing of yum content
-#
-# $enable_file:: Enable file content plugin
-#
-# $enable_puppet:: Enable puppet content plugin
-#
-# $enable_docker:: Enable docker content plugin
-#
-# $enable_deb:: Enable debian content plugin
-#
# === Advanced parameters:
#
# $puppet:: Enable puppet
#
-# $pulp_admin_password:: Password for the Pulp admin user. It should be left blank so that a random password is generated
-#
-# $pulp_max_speed:: The maximum download speed per second for a Pulp task, such as a sync. (e.g. "4 Kb" (Uses SI KB), 4MB, or 1GB" )
-#
-# $pulp_num_workers:: Number of Pulp workers to use.
-#
-# $pulp_proxy_port:: Port of the http proxy server
-#
-# $pulp_proxy_url:: URL of the http proxy server
-#
-# $pulp_proxy_username:: Proxy username for authentication
-#
-# $pulp_proxy_password:: Proxy password for authentication
-#
-# $pulp_puppet_wsgi_processes:: Number of WSGI processes to spawn for the puppet webapp
-#
-# $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_isos_to_pulpcore:: Proxy /pulp/isos to Pulpcore at /pulp/content
-#
-# $proxy_pulp_yum_to_pulpcore:: Proxy /pulp/yum to Pulpcore at /pulp/content
-#
# $reverse_proxy:: Add reverse proxy to the parent
#
# $reverse_proxy_port:: Reverse proxy listening port
#
# $ssl_protocol:: Apache SSLProtocol configuration to use
#
-# $qpid_router:: Configure qpid dispatch router
-#
-# $qpid_router_hub_addr:: Address for dispatch router hub
-#
-# $qpid_router_hub_port:: Port for dispatch router hub
-#
-# $qpid_router_agent_addr:: Listener address for goferd agents
-#
-# $qpid_router_agent_port:: Listener port for goferd agents
-#
-# $qpid_router_broker_addr:: Address of qpidd broker to connect to
-#
-# $qpid_router_broker_port:: Port of qpidd broker to connect to
-#
-# $qpid_router_logging_level:: Logging level of dispatch router (e.g. info+ or debug+)
-#
-# $qpid_router_logging:: Whether to log to file or syslog.
-#
-# $qpid_router_logging_path:: Directory for dispatch router logs, if using file logging
-#
-# $qpid_router_ssl_ciphers:: SSL Ciphers to support in dispatch router
-#
-# $qpid_router_ssl_protocols:: Protocols to support in dispatch router (e.g. TLSv1.2, etc)
-#
-# $qpid_router_sasl_mech:: SASL mechanism to be used from router to broker
-#
-# $qpid_router_sasl_username:: SASL username to be used from router to broker
-#
-# $qpid_router_sasl_password:: SASL password to be used from router to broker
-#
-# $manage_broker:: Manage the qpid message broker when applicable
-#
-# $pulp_worker_timeout:: The amount of time (in seconds) before considering a worker as missing. If Pulp's
-# mongo database has slow I/O, then setting a higher number may resolve issues where workers are
-# going missing incorrectly.
-#
# $pulpcore_manage_postgresql:: Manage the Pulpcore PostgreSQL database.
#
# $pulpcore_postgresql_host:: Host of the Pulpcore PostgreSQL database. Must be specified if external/unmanaged.
@@ -114,50 +40,12 @@
# incrementally with benchmarking at each step to determine an optimal value for your deployment.
#
class foreman_proxy_content (
- String[1] $parent_fqdn = $foreman_proxy_content::params::parent_fqdn,
- String $pulp_admin_password = $foreman_proxy_content::params::pulp_admin_password,
- Optional[String] $pulp_max_speed = $foreman_proxy_content::params::pulp_max_speed,
- Optional[Integer[1]] $pulp_num_workers = $foreman_proxy_content::params::pulp_num_workers,
- Optional[String] $pulp_proxy_password = $foreman_proxy_content::params::pulp_proxy_password,
- Optional[Stdlib::Port] $pulp_proxy_port = $foreman_proxy_content::params::pulp_proxy_port,
- Optional[String] $pulp_proxy_url = $foreman_proxy_content::params::pulp_proxy_url,
- Optional[String] $pulp_proxy_username = $foreman_proxy_content::params::pulp_proxy_username,
- Optional[Integer[1]] $pulp_puppet_wsgi_processes = $foreman_proxy_content::params::pulp_puppet_wsgi_processes,
- Optional[Stdlib::Absolutepath] $pulp_ca_cert = $foreman_proxy_content::params::pulp_ca_cert,
- Integer[0] $pulp_worker_timeout = $foreman_proxy_content::params::pulp_worker_timeout,
-
Boolean $puppet = $foreman_proxy_content::params::puppet,
Boolean $reverse_proxy = $foreman_proxy_content::params::reverse_proxy,
Stdlib::Port $reverse_proxy_port = $foreman_proxy_content::params::reverse_proxy_port,
Optional[String] $ssl_protocol = $foreman_proxy_content::params::ssl_protocol,
- Boolean $qpid_router = $foreman_proxy_content::params::qpid_router,
- Optional[String] $qpid_router_hub_addr = $foreman_proxy_content::params::qpid_router_hub_addr,
- Stdlib::Port $qpid_router_hub_port = $foreman_proxy_content::params::qpid_router_hub_port,
- Optional[String] $qpid_router_agent_addr = $foreman_proxy_content::params::qpid_router_agent_addr,
- Stdlib::Port $qpid_router_agent_port = $foreman_proxy_content::params::qpid_router_agent_port,
- String $qpid_router_broker_addr = $foreman_proxy_content::params::qpid_router_broker_addr,
- Stdlib::Port $qpid_router_broker_port = $foreman_proxy_content::params::qpid_router_broker_port,
- String $qpid_router_logging_level = $foreman_proxy_content::params::qpid_router_logging_level,
- Enum['file', 'syslog'] $qpid_router_logging = $foreman_proxy_content::params::qpid_router_logging,
- Stdlib::Absolutepath $qpid_router_logging_path = $foreman_proxy_content::params::qpid_router_logging_path,
- Optional[String] $qpid_router_ssl_ciphers = $foreman_proxy_content::params::qpid_router_ssl_ciphers,
- Optional[Array[String]] $qpid_router_ssl_protocols = $foreman_proxy_content::params::qpid_router_ssl_protocols,
- Optional[String] $qpid_router_sasl_mech = $foreman_proxy_content::params::qpid_router_sasl_mech,
- Optional[String] $qpid_router_sasl_username = $foreman_proxy_content::params::qpid_router_sasl_username,
- Optional[String] $qpid_router_sasl_password = $foreman_proxy_content::params::qpid_router_sasl_password,
- 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_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,
- Boolean $enable_docker = $foreman_proxy_content::params::enable_docker,
- Boolean $enable_deb = $foreman_proxy_content::params::enable_deb,
-
- Boolean $manage_broker = $foreman_proxy_content::params::manage_broker,
-
Boolean $pulpcore_manage_postgresql = $foreman_proxy_content::params::pulpcore_manage_postgresql,
Stdlib::Host $pulpcore_postgresql_host = $foreman_proxy_content::params::pulpcore_postgresql_host,
Stdlib::Port $pulpcore_postgresql_port = $foreman_proxy_content::params::pulpcore_postgresql_port,
@@ -175,20 +63,16 @@
include foreman_proxy
include foreman_proxy::plugin::pulp
- $pulp_master = $foreman_proxy::plugin::pulp::enabled
- $pulp = $foreman_proxy::plugin::pulp::pulpnode_enabled
$pulpcore_mirror = $foreman_proxy::plugin::pulp::pulpcore_mirror
$pulpcore = $foreman_proxy::plugin::pulp::pulpcore_enabled
- $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)
-
$foreman_proxy_fqdn = $facts['networking']['fqdn']
$foreman_url = $foreman_proxy::foreman_base_url
- $reverse_proxy_real = $pulp or $reverse_proxy
# TODO: doesn't allow deploying a Pulp non-mirror without Foreman
- $shared_with_foreman_vhost = ($pulpcore and !$pulpcore_mirror) or $pulp_master
+ $shared_with_foreman_vhost = $pulpcore and !$pulpcore_mirror
+
+ $reverse_proxy_real = !$shared_with_foreman_vhost and $reverse_proxy
$rhsm_port = $reverse_proxy_real ? {
true => $reverse_proxy_port,
@@ -197,10 +81,6 @@
ensure_packages('katello-debug')
- if ($pulp_master or $pulp) and $facts['os']['release']['major'] != '7' {
- fail('Pulp 2 is only supported on CentOS 7')
- }
-
class { 'certs::foreman_proxy':
hostname => $foreman_proxy_fqdn,
require => Class['certs'],
@@ -211,7 +91,7 @@
rhsm_port => $rhsm_port,
}
- if $pulp or $reverse_proxy_real {
+ if $reverse_proxy_real {
class { 'certs::apache':
hostname => $foreman_proxy_fqdn,
require => Class['certs'],
@@ -225,114 +105,8 @@
}
}
- if $pulp_master or $pulp {
- if $qpid_router {
- class { 'foreman_proxy_content::dispatch_router':
- agent_addr => $qpid_router_agent_addr,
- agent_port => $qpid_router_agent_port,
- ssl_ciphers => $qpid_router_ssl_ciphers,
- ssl_protocols => $qpid_router_ssl_protocols,
- logging_level => $qpid_router_logging_level,
- logging => $qpid_router_logging,
- logging_path => $qpid_router_logging_path,
- }
- contain foreman_proxy_content::dispatch_router
-
- if $pulp_master {
- class { 'foreman_proxy_content::dispatch_router::hub':
- hub_addr => $qpid_router_hub_addr,
- hub_port => $qpid_router_hub_port,
- broker_addr => $qpid_router_broker_addr,
- broker_port => $qpid_router_broker_port,
- sasl_mech => $qpid_router_sasl_mech,
- sasl_username => $qpid_router_sasl_username,
- sasl_password => $qpid_router_sasl_password,
- }
- contain foreman_proxy_content::dispatch_router::hub
- } else {
- class { 'foreman_proxy_content::dispatch_router::connector':
- host => $parent_fqdn,
- port => $qpid_router_hub_port,
- }
- contain foreman_proxy_content::dispatch_router::connector
- }
- }
-
- include certs::apache
- class { 'pulp::crane':
- cert => $certs::apache::apache_cert,
- key => $certs::apache::apache_key,
- ssl_chain => $certs::katello_server_ca_cert,
- ca_cert => $certs::katello_default_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
- if $pulp {
- include apache
-
- file {'/etc/httpd/conf.d/pulp_nodes.conf':
- ensure => file,
- content => template('foreman_proxy_content/pulp_nodes.conf.erb'),
- owner => 'root',
- group => 'root',
- mode => '0644',
- }
-
- if $manage_broker {
- include foreman_proxy_content::broker
- }
-
- class { 'certs::qpid_client':
- require => Class['pulp::install'],
- notify => Class['pulp::service'],
- }
-
- class { 'pulp':
- enable_ostree => $enable_ostree,
- enable_rpm => $enable_pulp2_rpm,
- enable_iso => $enable_pulp2_iso,
- enable_deb => $enable_deb,
- enable_puppet => $enable_puppet,
- enable_docker => $enable_docker,
- default_password => $pulp_admin_password,
- messaging_transport => 'qpid',
- messaging_auth_enabled => false,
- messaging_ca_cert => pick($pulp_ca_cert, $certs::qpid_client::qpid_client_ca_cert),
- messaging_client_cert => $certs::qpid_client::qpid_client_cert,
- messaging_url => "ssl://${qpid_router_broker_addr}:${qpid_router_broker_port}",
- broker_url => "qpid://${qpid_router_broker_addr}:${qpid_router_broker_port}",
- broker_use_ssl => true,
- manage_broker => false,
- manage_httpd => true,
- manage_plugins_httpd => true,
- manage_squid => true,
- puppet_wsgi_processes => $pulp_puppet_wsgi_processes,
- num_workers => $pulp_num_workers,
- repo_auth => true,
- https_cert => $certs::apache::apache_cert,
- https_key => $certs::apache::apache_key,
- https_chain => $certs::apache::apache_ca_cert,
- https_ca_cert => $certs::ca_cert,
- ssl_protocol => $ssl_protocol,
- yum_max_speed => $pulp_max_speed,
- proxy_port => $pulp_proxy_port,
- proxy_url => $pulp_proxy_url,
- proxy_username => $pulp_proxy_username,
- proxy_password => $pulp_proxy_password,
- worker_timeout => $pulp_worker_timeout,
- }
-
- pulp::apache::fragment{'gpg_key_proxy':
- ssl_content => template('foreman_proxy_content/_pulp_gpg_proxy.erb'),
- }
- }
-
if $pulpcore {
if $shared_with_foreman_vhost {
include foreman::config::apache
@@ -341,17 +115,14 @@
$apache_http_vhost = 'foreman'
$apache_https_vhost = 'foreman-ssl'
Class['foreman::config::apache'] -> Class['pulpcore::apache']
- } elsif $pulp and $pulp::manage_httpd {
- $servername = $facts['networking']['fqdn']
- $priority = '05'
- $apache_http_vhost = 'pulp-http'
- $apache_https_vhost = 'pulp-https'
- Class['pulp::apache'] -> Class['pulpcore::apache']
} else {
$servername = undef
$priority = undef
$apache_http_vhost = undef
$apache_https_vhost = undef
+
+ include certs::apache
+ # TODO: certs
}
class { 'pulpcore':
@@ -375,30 +146,20 @@
before => Class['foreman_proxy::plugin::pulp'],
}
- if $pulp_master {
- include pulp
- class { 'pulpcore::plugin::migration':
- mongo_db_name => $pulp::db_name,
- mongo_db_seeds => $pulp::db_seeds,
- mongo_db_username => $pulp::db_username,
- mongo_db_password => $pulp::db_password,
- mongo_db_replica_set => $pulp::db_replica_set,
- mongo_db_ssl => $pulp::db_ssl,
- mongo_db_ssl_keyfile => $pulp::db_ssl_keyfile,
- mongo_db_ssl_certfile => $pulp::db_ssl_certfile,
- mongo_db_verify_ssl => $pulp::db_verify_ssl,
- mongo_db_ca_path => $pulp::db_ca_path,
- }
- }
-
include pulpcore::plugin::container
class { 'pulpcore::plugin::file':
- use_pulp2_content_route => $proxy_pulp_isos_to_pulpcore,
+ use_pulp2_content_route => true,
}
class { 'pulpcore::plugin::rpm':
- use_pulp2_content_route => $proxy_pulp_yum_to_pulpcore,
+ use_pulp2_content_route => true,
}
include pulpcore::plugin::certguard
+
+ unless $shared_with_foreman_vhost {
+ pulpcore::apache::fragment { 'gpg_key_proxy':
+ https_content => template('foreman_proxy_content/_pulp_gpg_proxy.erb'),
+ }
+ }
}
if $puppet {
diff --git a/spec/classes/foreman_proxy_content__broker_spec.rb b/spec/classes/foreman_proxy_content__broker_spec.rb
deleted file mode 100644
index e955d4af..00000000
--- a/spec/classes/foreman_proxy_content__broker_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'foreman_proxy_content::broker' do
- on_supported_os.each do |os, facts|
- context "on #{os}", if: facts[:operatingsystemmajrelease] == '7' do
- let :facts do
- facts
- end
-
- it { is_expected.to compile.with_all_deps }
- end
- end
-end
diff --git a/spec/classes/foreman_proxy_content_spec.rb b/spec/classes/foreman_proxy_content_spec.rb
index 5fbe98a5..d91640f9 100644
--- a/spec/classes/foreman_proxy_content_spec.rb
+++ b/spec/classes/foreman_proxy_content_spec.rb
@@ -10,8 +10,6 @@
<<-PUPPET
include foreman_proxy
class { 'foreman_proxy::plugin::pulp':
- enabled => false,
- pulpnode_enabled => false,
pulpcore_enabled => false,
}
PUPPET
@@ -22,49 +20,11 @@ class { 'foreman_proxy::plugin::pulp':
it { is_expected.to contain_class('foreman_proxy_content::pub_dir') }
end
- context 'with pulp', if: facts[:operatingsystemmajrelease] == '7' do
- let(:params) do
- {
- qpid_router: false
- }
- end
-
- let(:pre_condition) do
- <<-PUPPET
- include foreman_proxy
- class { 'foreman_proxy::plugin::pulp':
- enabled => false,
- pulpnode_enabled => true,
- pulpcore_enabled => false,
- }
- PUPPET
- end
-
- it { is_expected.to compile.with_all_deps }
- it { is_expected.to contain_class('pulp').with(manage_squid: true) }
- it { is_expected.not_to contain_class('foreman_proxy_content::dispatch_router') }
- it { is_expected.not_to contain_class('pulpcore') }
- it { is_expected.to contain_class('foreman_proxy_content::pub_dir') }
-
- it do
- is_expected.to contain_pulp__apache__fragment('gpg_key_proxy')
- .with_ssl_content(%r{ProxyPass /katello/api/v2/repositories/ https://foo\.example\.com/katello/api/v2/repositories/})
- end
- end
-
context 'with pulpcore' do
- let(:params) do
- {
- qpid_router: false
- }
- end
-
let(:pre_condition) do
<<-PUPPET
include foreman_proxy
class { 'foreman_proxy::plugin::pulp':
- enabled => false,
- pulpnode_enabled => false,
pulpcore_enabled => true,
pulpcore_mirror => false,
}
@@ -80,6 +40,11 @@ class { 'foreman_proxy::plugin::pulp':
.that_comes_before('Class[foreman_proxy::plugin::pulp]')
end
+ it do
+ is_expected.to contain_pulp__apache__fragment('gpg_key_proxy')
+ .with_ssl_content(%r{ProxyPass /katello/api/v2/repositories/ https://foo\.example\.com/katello/api/v2/repositories/})
+ end
+
context 'with external postgres' do
let(:params) do
super().merge(
@@ -161,10 +126,7 @@ class { 'puppet':
}
include foreman_proxy
class { 'foreman_proxy::plugin::pulp':
- enabled => false,
- pulpnode_enabled => false,
pulpcore_enabled => false,
- pulpcore_mirror => false,
}
PUPPET
end
@@ -181,10 +143,7 @@ class { 'foreman_proxy::plugin::pulp':
<<-PUPPET
include foreman_proxy
class { 'foreman_proxy::plugin::pulp':
- enabled => false,
- pulpnode_enabled => false,
pulpcore_enabled => false,
- pulpcore_mirror => false,
}
PUPPET
end
diff --git a/templates/pulp_nodes.conf.erb b/templates/pulp_nodes.conf.erb
deleted file mode 100644
index 7064381e..00000000
--- a/templates/pulp_nodes.conf.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Apache configuration file for pulp web services and repositories
-#
-
-# -- HTTP Repositories ---------
-
-Alias /pulp/nodes/http/repos /var/www/pulp/nodes/http/repos
-
-
- Options FollowSymLinks Indexes
-
-
-# -- HTTPS Repositories ---------
-
-Alias /pulp/nodes/https/repos /var/www/pulp/nodes/https/repos
-
-
- Options FollowSymLinks Indexes
- SSLRequireSSL
- SSLVerifyClient 'require'
- SSLVerifyDepth 5
- SSLOptions +FakeBasicAuth
- SSLRequire %{SSL_CLIENT_S_DN_O} eq "PULP" and %{SSL_CLIENT_S_DN_OU} eq "NODES"
-
-
-Alias /pulp/nodes/content /var/www/pulp/nodes/content
-
-
- Options FollowSymLinks Indexes
- SSLRequireSSL
- SSLVerifyClient 'require'
- SSLVerifyDepth 5
- SSLOptions +FakeBasicAuth
- SSLRequire %{SSL_CLIENT_S_DN_O} eq "PULP" and %{SSL_CLIENT_S_DN_OU} eq "NODES"
-