Skip to content

Commit

Permalink
Refactor Katello entry points
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl committed Dec 2, 2019
1 parent 86bf090 commit c15d2a7
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ mod 'theforeman/puppet', :git => 'https://github.com/theforeman/pupp
# Top-level katello modules
mod 'katello/foreman_proxy_content', :git => 'https://github.com/theforeman/puppet-foreman_proxy_content'
mod 'katello/certs', :git => 'https://github.com/theforeman/puppet-certs'
mod 'katello/katello', :git => 'https://github.com/theforeman/puppet-katello'
mod 'katello/katello', :git => 'https://github.com/ekohl/puppet-katello', branch: 'globals'
5 changes: 5 additions & 0 deletions config/katello-answers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
certs:
group: foreman
katello: true
global: true
application: true
pulp: true
candlepin: true
qpid: true
foreman:
initial_organization: Default Organization
initial_location: Default Location
Expand Down
22 changes: 20 additions & 2 deletions config/katello.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,23 @@
# If using the Debian ruby-kafo package, uncomment this
# :kafo_modules_dir: /usr/lib/ruby/vendor_ruby/kafo/modules

# Unused, but remains present for older config migrations
:mapping: {}
:mapping:
:global:
:dir_name: 'katello'
:manifest_name: 'globals'
:pulp:
:dir_name: 'katello'
:manifest_name: 'pulp'
:params_name: 'params'
:candlepin:
:dir_name: 'katello'
:manifest_name: 'candlepin'
:params_name: 'params'
:qpid:
:dir_name: 'katello'
:manifest_name: 'qpid'
:params_name: 'params'
:application:
:dir_name: 'katello'
:manifest_name: 'application'
:params_name: 'params'

0 comments on commit c15d2a7

Please sign in to comment.