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

Jump to bottom

Refactor Katello entry points #421

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Refactor Katello entry points #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1170719
Match default answers to kafo output format
ekohl Dec 2, 2019
4f8c20c
Refactor Katello entry points
ekohl Dec 2, 2019
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
33 changes: 19 additions & 14 deletions config/katello-answers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
# shows up in the interactive menu
#
# See params.pp in each class for what options are available

---
certs:
group: foreman
foreman:
client_ssl_ca: /etc/foreman/proxy_ca.pem
client_ssl_cert: /etc/foreman/client_cert.pem
client_ssl_key: /etc/foreman/client_key.pem
client_ssl_ca: "/etc/foreman/proxy_ca.pem"
client_ssl_cert: "/etc/foreman/client_cert.pem"
client_ssl_key: "/etc/foreman/client_key.pem"
initial_location: Default Location
initial_organization: Default Organization
server_ssl_ca: /etc/pki/katello/certs/katello-default-ca.crt
server_ssl_cert: /etc/pki/katello/certs/katello-apache.crt
server_ssl_chain: /etc/pki/katello/certs/katello-server-ca.crt
server_ssl_ca: "/etc/pki/katello/certs/katello-default-ca.crt"
server_ssl_cert: "/etc/pki/katello/certs/katello-apache.crt"
server_ssl_chain: "/etc/pki/katello/certs/katello-server-ca.crt"
server_ssl_crl: ""
server_ssl_key: /etc/pki/katello/private/katello-apache.key
server_ssl_key: "/etc/pki/katello/private/katello-apache.key"
foreman::cli: true
foreman::cli::ansible: false
foreman::cli::azure: false
Expand Down Expand Up @@ -79,13 +80,13 @@ foreman::plugin::virt_who_configure: false
foreman::plugin::webhooks: false
foreman::plugin::wreckingball: false
foreman_proxy:
foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem
foreman_ssl_ca: "/etc/foreman-proxy/foreman_ssl_ca.pem"
foreman_ssl_cert: "/etc/foreman-proxy/foreman_ssl_cert.pem"
foreman_ssl_key: "/etc/foreman-proxy/foreman_ssl_key.pem"
manage_puppet_group: false
ssl_ca: /etc/foreman-proxy/ssl_ca.pem
ssl_cert: /etc/foreman-proxy/ssl_cert.pem
ssl_key: /etc/foreman-proxy/ssl_key.pem
ssl_ca: "/etc/foreman-proxy/ssl_ca.pem"
ssl_cert: "/etc/foreman-proxy/ssl_cert.pem"
ssl_key: "/etc/foreman-proxy/ssl_key.pem"
ssl_port: '9090'
puppet: false
puppetca: false
Expand All @@ -103,5 +104,9 @@ foreman_proxy::plugin::remote_execution::script: false
foreman_proxy::plugin::salt: false
foreman_proxy::plugin::shellhooks: false
foreman_proxy_content: true
katello: true
puppet: false
global: true
application: true
pulp: true
candlepin: true
qpid: true
22 changes: 20 additions & 2 deletions config/katello.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,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'