-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This moves all non-default options into the Hiera layer. Since Kafo 3.0 this works and is supported. It also means --reset-$option loads the installer default rather than the Puppet default.
- Loading branch information
Showing
15 changed files
with
62 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
config/foreman-proxy-content.migrations/180702133937-set-puppet-integration-answer.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
if answers['foreman_proxy_content'].is_a?(Hash) | ||
enabled = answers['puppet'].is_a?(Hash) && answers['puppet']['server'] != false && answers['puppet']['server_foreman'] != false | ||
enabled = answers['puppet'] == true || (answers['puppet'].is_a?(Hash) && answers['puppet']['server'] != false && answers['puppet']['server_foreman'] != false) | ||
answers['foreman_proxy_content']['puppet'] = false unless enabled | ||
end |
5 changes: 0 additions & 5 deletions
5
config/foreman-proxy-content.migrations/180813131441-unmanage-puppet-group.rb
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
config/foreman-proxy-content.migrations/210112194603-enable-pulp3-content-proxy.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
config/foreman.hiera/scenario/foreman-proxy-content/defaults.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
certs::generate: false | ||
|
||
foreman_proxy_content::pulpcore_mirror: true | ||
|
||
foreman_proxy::foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem | ||
foreman_proxy::foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem | ||
foreman_proxy::foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem | ||
foreman_proxy::http: true | ||
foreman_proxy::manage_puppet_group: false | ||
foreman_proxy::ssl_ca: /etc/foreman-proxy/ssl_ca.pem | ||
foreman_proxy::ssl_cert: /etc/foreman-proxy/ssl_cert.pem | ||
foreman_proxy::ssl_key: /etc/foreman-proxy/ssl_key.pem | ||
foreman_proxy::ssl_port: 9090 | ||
foreman_proxy::templates: true | ||
|
||
puppet::server_foreman_ssl_ca: /etc/pki/katello/puppet/puppet_client_ca.crt | ||
puppet::server_foreman_ssl_cert: /etc/pki/katello/puppet/puppet_client.crt | ||
puppet::server_foreman_ssl_key: /etc/pki/katello/puppet/puppet_client.key |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
certs::group: foreman | ||
|
||
foreman::client_ssl_ca: /etc/foreman/proxy_ca.pem | ||
foreman::client_ssl_cert: /etc/foreman/client_cert.pem | ||
foreman::client_ssl_key: /etc/foreman/client_key.pem | ||
foreman::initial_location: Default Location | ||
foreman::initial_organization: Default Organization | ||
foreman::server_ssl_ca: /etc/pki/katello/certs/katello-default-ca.crt | ||
foreman::server_ssl_cert: /etc/pki/katello/certs/katello-apache.crt | ||
foreman::server_ssl_chain: /etc/pki/katello/certs/katello-server-ca.crt | ||
foreman::server_ssl_crl: "" | ||
foreman::server_ssl_key: /etc/pki/katello/private/katello-apache.key | ||
|
||
foreman_proxy::foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem | ||
foreman_proxy::foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem | ||
foreman_proxy::foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem | ||
foreman_proxy::manage_puppet_group: false | ||
foreman_proxy::ssl_ca: /etc/foreman-proxy/ssl_ca.pem | ||
foreman_proxy::ssl_cert: /etc/foreman-proxy/ssl_cert.pem | ||
foreman_proxy::ssl_key: /etc/foreman-proxy/ssl_key.pem | ||
foreman_proxy::ssl_port: 9090 | ||
|
||
puppet::server_foreman_ssl_ca: /etc/pki/katello/puppet/puppet_client_ca.crt | ||
puppet::server_foreman_ssl_cert: /etc/pki/katello/puppet/puppet_client.crt | ||
puppet::server_foreman_ssl_key: /etc/pki/katello/puppet/puppet_client.key |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# Redetermine the value of passenger_ruby, as it changed on Debian in puppet-foreman f9329b6 | ||
answers['foreman'].delete('passenger_ruby') if answers['foreman'] | ||
answers['foreman'].delete('passenger_ruby') if answers['foreman'].is_a?(Hash) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
config/katello.migrations/180813131441-unmanage-puppet-group.rb
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters