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

Allow user to specify additional options to "realm join" #41

Merged
merged 6 commits into from
Dec 17, 2017
Merged

Allow user to specify additional options to "realm join" #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c58f27
Allow specifing additional options for 'realm join' command
Nov 23, 2017
186f94c
Add new option to hiera as well
Nov 23, 2017
10a7736
Strip command arguments
Nov 23, 2017
7fde799
computer_name needs to be a variable
Nov 23, 2017
eada748
Make linter happy
Nov 24, 2017
4ad224c
Update test to include --computer-name
Nov 24, 2017
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
2 changes: 2 additions & 0 deletions data/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ realmd::krb_keytab: ~
realmd::krb_config_file: /etc/krb5.conf
realmd::manage_krb_config: true
realmd::krb_client_package_ensure: present
realmd::extra_join_options: ~
realmd::computer_name: ~
realmd::krb_config:
logging:
default: FILE:/var/log/krb5libs.log
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
Boolean $manage_krb_config,
Variant[String, Undef] $ou,
Hash $required_packages,
Variant[Array, Undef] $extra_join_options,
Variant[String[1, 15], Undef] $computer_name,
) {

if $krb_ticket_join == false {
Expand Down
21 changes: 15 additions & 6 deletions manifests/join/password.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,27 @@
#
class realmd::join::password {

$_domain = $::realmd::domain
$_user = $::realmd::domain_join_user
$_password = $::realmd::domain_join_password
$_ou = $::realmd::ou
$_domain = $::realmd::domain
$_user = $::realmd::domain_join_user
$_password = $::realmd::domain_join_password
$_ou = $::realmd::ou
$_extra_join_options = $::realmd::extra_join_options

if $::realmd::computer_name != undef {
$_computer_name = $::realmd::computer_name
} else {
$_computer_name = $::hostname[0,15]
}

$_computer_name_arg = ["--computer-name=${_computer_name}"]

if $_ou != undef {
$_realm_args = [$_domain, '--unattended', "--computer-ou='OU=${_ou}'", "--user=${_user}"]
} else {
$_realm_args = [$_domain, '--unattended', "--user=${_user}"]
}

$_args = join($_realm_args, ' ')
$_args = strip(join(concat($_realm_args, $_computer_name_arg, $_extra_join_options), ' '))

file { '/usr/libexec':
ensure => 'directory',
Expand All @@ -34,7 +43,7 @@
environment => ["AD_JOIN_PASSWORD=${_password}"],
path => '/usr/bin:/usr/sbin:/bin',
command => "/usr/libexec/realm_join_with_password realm join ${_args}",
unless => "klist -k /etc/krb5.keytab | grep -i '${::hostname[0,15]}@${_domain}'",
unless => "klist -k /etc/krb5.keytab | grep -i '${_computer_name}@${_domain}'",
require => File['/usr/libexec/realm_join_with_password'],
}
}
2 changes: 1 addition & 1 deletion spec/classes/join__password_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
it do
is_expected.to contain_exec('realm_join_with_password').with({
'path' => '/usr/bin:/usr/sbin:/bin',
'command' => '/usr/libexec/realm_join_with_password realm join example.com --unattended --user=user',
'command' => '/usr/libexec/realm_join_with_password realm join example.com --unattended --user=user --computer-name=foo',
'unless' => "klist -k /etc/krb5.keytab | grep -i 'foo@example.com'",
})
end
Expand Down