Skip to content

Commit

Permalink
make all repo types configurable (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlsherrill authored and sean797 committed Feb 27, 2018
1 parent c199e82 commit 8344b65
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
25 changes: 21 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@
#
# $parent_fqdn:: FQDN of the parent node.
#
# $enable_ostree:: Boolean to enable ostree plugin. This requires existence of an ostree install.
# $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
#
# $certs_tar:: Path to a tar with certs for the node
#
Expand Down Expand Up @@ -105,6 +115,11 @@
String $qpid_router_logging_level = $foreman_proxy_content::params::qpid_router_logging_level,
Stdlib::Absolutepath $qpid_router_logging_path = $foreman_proxy_content::params::qpid_router_logging_path,
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 $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,
) inherits foreman_proxy_content::params {
Expand Down Expand Up @@ -190,10 +205,12 @@
require => Class['certs'],
}
~> class { '::pulp':
enable_rpm => true,
enable_puppet => true,
enable_docker => true,
enable_ostree => $enable_ostree,
enable_rpm => $enable_yum,
enable_iso => $enable_file,
enable_deb => $enable_deb,
enable_puppet => $enable_puppet,
enable_docker => $enable_docker,
default_password => $pulp_admin_password,
messaging_transport => 'qpid',
messaging_auth_enabled => false,
Expand Down
5 changes: 5 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
$qpid_router_logging_path = '/var/log/qdrouterd'

$enable_ostree = false
$enable_yum = true
$enable_file = true
$enable_puppet = true
$enable_docker = true
$enable_deb = true

$manage_broker = true
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
{
"name": "katello-pulp",
"version_requirement": ">= 4.2.0 < 6.0.0"
"version_requirement": ">= 5.3.0 < 6.0.0"
},
{
"name": "katello-qpid",
Expand Down

0 comments on commit 8344b65

Please sign in to comment.