Merge pull request acjohnson#10 from jacraig-vcu/feature/ad_join_comp…

…uter_name Support custom computer names
pfhonore · Mar 2, 2020 · 8edab72 · 8edab72
2 parents fe5ffb3 + 7f48879
commit 8edab72
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ class {'::adcli':
   ad_join_password          => 'secret',
   ad_join_ou                => 'ou=container,dc=example,dc=com',
   ad_join_domain_controller => 'dc01.example.com',
+  ad_join_computer_name     => 'TEST-CENTOS-76',
   ad_join_os                => 'CentOS',
   ad_join_os_version        => '7',
   ad_join_os_service_pack   => '6'
@@ -55,6 +56,7 @@ adcli::ad_join_username: 'username'
 adcli::ad_join_password: 'secret'
 adcli::ad_join_ou: 'ou=container,dc=example,dc=com'
 adcli::ad_join_domain_controller: 'dc01.example.com'
+adcli::ad_join_computer_name: 'TEST-CENTOS-76'
 adcli::ad_join_os: 'CentOS'
 adcli::ad_join_os_version: '7'
 adcli::ad_join_os_service_pack: '6'
@@ -88,6 +90,12 @@ Default: undef
 Type: string
 Default: undef
 
+`$ad_join_computer_name`
+(optional) Specify a custom computer name to use during the join operation.  This equates to the
+sAMAccountName property in Active Directory.
+Type: string
+Default: undef
+
 `$ad_join_os`
 (optional) Populates the Active Directory value for Operating System Name.
 Type: string

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -47,6 +47,7 @@
   $ad_join_password          = $adcli::params::ad_join_password,
   $ad_join_ou                = $adcli::params::ad_join_ou,
   $ad_join_domain_controller = $adcli::params::ad_join_domain_controller,
+  $ad_join_computer_name     = $adcli::params::ad_join_computer_name,
   $ad_join_os                = $adcli::params::ad_join_os,
   $ad_join_os_version        = $adcli::params::ad_join_os_version,
   $ad_join_os_service_pack   = $adcli::params::ad_join_os_service_pack,
@@ -56,6 +57,7 @@
   validate_legacy(String, 'validate_string', $ad_join_password)
   validate_legacy(String, 'validate_string', $ad_join_ou)
   validate_legacy(String, 'validate_string', $ad_join_domain_controller)
+  validate_legacy(String, 'validate_string', $ad_join_computer_name)
   validate_legacy(String, 'validate_string', $ad_join_os)
   validate_legacy(String, 'validate_string', $ad_join_os_version)
   validate_legacy(String, 'validate_string', $ad_join_os_service_pack)

diff --git a/manifests/join.pp b/manifests/join.pp
@@ -10,6 +10,7 @@
   $ad_join_password          = $adcli::ad_join_password,
   $ad_join_ou                = $adcli::ad_join_ou,
   $ad_join_domain_controller = $adcli::ad_join_domain_controller,
+  $ad_join_computer_name     = $adcli::ad_join_computer_name,
   $ad_join_os                = $adcli::ad_join_os,
   $ad_join_os_version        = $adcli::ad_join_os_version,
   $ad_join_os_service_pack   = $adcli::ad_join_os_service_pack
@@ -33,6 +34,11 @@
     } else {
       $ad_join_domain_controller_command = ''
     }
+    if $ad_join_computer_name != undef {
+      $ad_join_computer_name_command = " --computer-name='${ad_join_computer_name}'"
+    } else {
+      $ad_join_computer_name_command = ''
+    }
     if $ad_join_os != undef {
       $ad_join_os_command = " --os-name=\'${ad_join_os}\'"
     } else {
@@ -49,9 +55,9 @@
       $ad_join_os_service_pack_command = ''
     }
     exec {'adcli_join':
-      command   => "/bin/echo -n \'${ad_join_password}\' | /usr/sbin/adcli join ${ad_join_domain_controller_command} --login-user=\'${ad_join_username}\' \
---domain=\'${ad_domain}\' --domain-ou=\'${ad_join_ou}\' --stdin-password --verbose ${ad_join_os_command} \
-${ad_join_os_version_command} ${ad_join_os_service_pack_command}",
+      command   => "/bin/echo -n \'${ad_join_password}\' | /usr/sbin/adcli join ${ad_join_domain_controller_command} \
+${ad_join_computer_name_command} --login-user=\'${ad_join_username}\' --domain=\'${ad_domain}\' --domain-ou=\'${ad_join_ou}\' \
+--stdin-password --verbose ${ad_join_os_command} ${ad_join_os_version_command} ${ad_join_os_service_pack_command}",
       logoutput => true,
       creates   => '/etc/krb5.keytab',
     }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -15,6 +15,7 @@
   $ad_join_password          = undef
   $ad_join_ou                = undef
   $ad_join_domain_controller = undef
+  $ad_join_computer_name     = undef
   $ad_join_os                = undef
   $ad_join_os_version        = undef
   $ad_join_os_service_pack   = undef

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -17,6 +17,7 @@
         ad_join_password: 'secret',
         ad_join_domain_controller: 'dc01.example.com',
         ad_join_ou: 'cn=computers,dn=ad,dn=example,dn=com',
+        ad_join_computer_name: 'TEST-RHEL-67',
         ad_join_os: 'RedHat',
         ad_join_os_version: '6',
         ad_join_os_service_pack: '7',
@@ -47,6 +48,7 @@
         ad_join_password: 'secret',
         ad_join_domain_controller: 'dc01.example.com',
         ad_join_ou: 'cn=computers,dn=ad,dn=example,dn=com',
+        ad_join_computer_name: 'TEST-RHEL-72',
         ad_join_os: 'RedHat',
         ad_join_os_version: '7',
         ad_join_os_service_pack: '2',