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.

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

Improve support for Foreman_proxy AD integration #429

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 6 additions & 2 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,13 @@
feature => 'Realm',
listen_on => $::foreman_proxy::realm_listen_on,
}
foreman_proxy::settings_file { 'realm_freeipa':
module => false,

if $foreman_proxy::realm_provider == 'freeipa' {
foreman_proxy::settings_file { 'realm_freeipa':
module => false,
}
}

foreman_proxy::settings_file { 'tftp':
enabled => $::foreman_proxy::tftp,
feature => 'TFTP',
Expand Down
17 changes: 16 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@
#
# $realm_principal:: Kerberos principal for realm updates
#
# $ad_config:: Active Directory config to pass into plugin
#
# $freeipa_config:: Path to FreeIPA default.conf configuration file
#
# $freeipa_remove_dns:: Remove DNS entries from FreeIPA when deleting hosts from realm
Expand Down Expand Up @@ -415,9 +417,10 @@
Enum['ipmitool', 'freeipmi', 'shell'] $bmc_default_provider = $::foreman_proxy::params::bmc_default_provider,
Boolean $realm = $::foreman_proxy::params::realm,
Foreman_proxy::ListenOn $realm_listen_on = $::foreman_proxy::params::realm_listen_on,
String $realm_provider = $::foreman_proxy::params::realm_provider,
Enum['freeipa', 'ad'] $realm_provider = $::foreman_proxy::params::realm_provider,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to keep this as a string since that allows third party plugins to still use the same infra.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I can tweak that back...

Stdlib::Absolutepath $realm_keytab = $::foreman_proxy::params::realm_keytab,
String $realm_principal = $::foreman_proxy::params::realm_principal,
Optional[Foreman_proxy::AdConfig] $ad_config = $::foreman_proxy::params::ad_config,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still have an issue in our installer with a Struct because of Kafo. theforeman/puppet-foreman#601 was limited by the same issue. I still need to look into this.

Stdlib::Absolutepath $freeipa_config = $::foreman_proxy::params::freeipa_config,
Boolean $freeipa_remove_dns = $::foreman_proxy::params::freeipa_remove_dns,
Variant[Undef, String[0], Stdlib::Absolutepath] $keyfile = $::foreman_proxy::params::keyfile,
Expand All @@ -436,6 +439,18 @@

$real_registered_proxy_url = pick($registered_proxy_url, "https://${::fqdn}:${ssl_port}")

if $realm_provider == 'ad' {
class { '::foreman_proxy::plugin::realm::ad':
realm => $ad_config['realm'],
domain_controller => $ad_config['domain_controller'],
ou => $ad_config['ou'],
computername_prefix => $ad_config['computername_prefix'],
computername_hash => $ad_config['computername_hash'],
computername_use_fqdn => $ad_config['computername_use_fqdn'],
version => $ad_config['version'],
}
}

# lint:ignore:spaceship_operator_without_tag
class { '::foreman_proxy::install': }
~> class { '::foreman_proxy::config': }
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@
$realm_provider = 'freeipa'
$realm_keytab = "${etc}/foreman-proxy/freeipa.keytab"
$realm_principal = '[email protected]'
$ad_config = undef
$freeipa_config = '/etc/ipa/default.conf'
$freeipa_remove_dns = true

Expand Down
27 changes: 22 additions & 5 deletions spec/classes/foreman_proxy__spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,28 @@
context "on #{os}" do
let(:facts) { facts }

it 'should include classes' do
should contain_class('foreman_proxy::install')
should contain_class('foreman_proxy::config')
should contain_class('foreman_proxy::service')
should contain_class('foreman_proxy::register')
describe 'with defaults' do
it 'should include classes' do
should contain_class('foreman_proxy::install')
should contain_class('foreman_proxy::config')
should contain_class('foreman_proxy::service')
should contain_class('foreman_proxy::register')
end
end

describe 'with realm_provider => ad' do
let(:params) do
{
:realm_provider => 'ad',
:ad_config => {
'realm' => 'EXAMPLE.COM',
'domain_controller' => 'dc.example.com'
}
}
end
it 'should include ad realm' do
should contain_class('foreman_proxy::plugin::realm::ad')
end
end
end
end
Expand Down
9 changes: 9 additions & 0 deletions types/adconfig.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type Foreman_proxy::AdConfig = Struct[{
Optional[computername_hash] => Boolean,
Optional[computername_prefix] => String[1],
Optional[computername_use_fqdn] => Boolean,
domain_controller => String[1],
Optional[ou] => String[1],
realm => String[1],
Optional[version] => String[1]
}]