Added upstream walkamongus-realmd 2.5.0 (rev c8b6a7e30c7abb5e09bd50b3f74a325c7a3358a0)

ashish1099 · ashish1099 · commit 403ad3041220 · 2025-10-10T06:31:14.000+05:30
Source is at https://github.com/walkamongus/realmd.git
diff --git a/modules/upstream/realmd/.fixtures.yml b/modules/upstream/realmd/.fixtures.yml
diff --git a/modules/upstream/realmd/.gitignore b/modules/upstream/realmd/.gitignore
diff --git a/modules/upstream/realmd/.travis.yml b/modules/upstream/realmd/.travis.yml
diff --git a/modules/upstream/realmd/CONTRIBUTING.md b/modules/upstream/realmd/CONTRIBUTING.md
@@ -89,4 +89,4 @@ variable to the name of a host described by a `.yml` file in the
 If you don't want to have to recreate the virtual machine every time you
 can use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will
 at least need `BEAKER_provision` set to yes (the default). The Vagrantfile
-for the created virtual machines will be in `.vagrant/beaker_vagrant_files`.
+for the created virtual machines will be in `.vagrant/beaker_vagrant_files`.
diff --git a/modules/upstream/realmd/Gemfile b/modules/upstream/realmd/Gemfile
@@ -1,34 +1,34 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-puppetversion = ENV['PUPPET_VERSION'].nil? ? '~> 4.10' : ENV['PUPPET_VERSION'].to_s
-puppetver = Gem::Version.new(%r/([\d.]+)/.match(puppetversion)[1])
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.18'
 
 group :test do
-  gem "rake"
-  gem "puppet", puppetversion
-  gem "rspec", '~> 3.8.0'
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "puppetlabs_spec_helper", '~> 2.1'
-  gem "metadata-json-lint"
-  gem "rspec-puppet-facts"
+  gem 'rake'
+  gem 'puppet', puppetversion
+  gem 'rspec', '~> 3.8.0'
+  gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
+  gem 'puppetlabs_spec_helper', '~> 2.1'
+  gem 'metadata-json-lint'
+  gem 'rspec-puppet-facts'
   gem 'rubocop', '0.57.2'
-  gem 'semantic_puppet' unless puppetver >= Gem::Version.new('5.0')
   gem 'simplecov', '>= 0.11.0'
   gem 'simplecov-console'
   gem 'puppet-lint', '>= 2.0.0'
   gem 'puppet-syntax', '~> 2.4.0'
-  gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+  gem 'json_pure', '<= 2.0.1'
   gem 'net-telnet', '0.1.1'
 end
 
 group :development do
-  gem "travis"              if RUBY_VERSION >= '2.1.0'
-  gem "travis-lint"         if RUBY_VERSION >= '2.1.0'
-  gem "guard-rake"          if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep
-  gem "puppet-blacksmith"
+  gem 'travis'
+  gem 'travis-lint'
+  gem 'guard-rake'
+  gem 'puppet-blacksmith'
 end
 
 group :system_tests do
-  gem 'beaker'       if RUBY_VERSION >= '2.1.8'
-  gem 'beaker-rspec' if RUBY_VERSION >= '2.1.8'
+  gem 'beaker'
+  gem 'beaker-vagrant'
+  gem 'beaker-rspec'
+  gem 'beaker-puppet'
 end
diff --git a/modules/upstream/realmd/README.markdown b/modules/upstream/realmd/README.markdown
@@ -137,7 +137,7 @@ Set up Realmd, join an Active Directory domain via a keytab and fully configure
 
 ### Parameters
 
-Default values are in params.pp.
+Default values are in data/common.yaml.
 
 * `realmd_package_name`: String. The name of the main Realmd package.
 * `realmd_config_file`: String. The absolute path of the Realmd configuration file.
@@ -150,6 +150,7 @@ Default values are in params.pp.
 * `sssd_config_file`: String. The absolute path of the SSSD configuration file.
 * `sssd_config`: Hash. A hash of configuration options structured in an ini-style format.
 * `manage_sssd_config`: Boolean. Enable or disable management of the SSSD configuration file.
+* `manage_sssd_service`: Boolean. Enable or disable management of the SSSD service.
 * `required_packages`: Hash. A hash of package resources to manage for any auxilliary functionality.
 * `domain`: String. The name of the domain to join.
 * `domain_join_user`: String. The account to be used in joining the domain.
diff --git a/modules/upstream/realmd/data/Debian.yaml b/modules/upstream/realmd/data/Debian.yaml
@@ -3,15 +3,11 @@ realmd::krb_client_package_name: krb5-user
 realmd::required_packages:
   sssd-tools:
     ensure: present
-  sssd:
-    ensure: present
   libpam-modules:
     ensure: present
   libnss-sss:
     ensure: present
   libpam-sss:
     ensure: present
-  adcli:
-    ensure: present
   samba-common-bin:
     ensure: present
diff --git a/modules/upstream/realmd/data/RedHat-6.yaml b/modules/upstream/realmd/data/RedHat-6.yaml
@@ -0,0 +1,10 @@
+---
+realmd::realmd_package_ensure: absent
+realmd::krb_client_package_name: krb5-workstation
+realmd::required_packages:
+  oddjob:
+    ensure: present
+  oddjob-mkhomedir:
+    ensure: present
+  samba4-common:
+    ensure: present
diff --git a/modules/upstream/realmd/data/RedHat.yaml b/modules/upstream/realmd/data/RedHat.yaml
@@ -1,9 +1,11 @@
 ---
 realmd::krb_client_package_name: krb5-workstation
+
 realmd::required_packages:
   oddjob:
     ensure: present
   oddjob-mkhomedir:
     ensure: present
   samba-common-tools:
     ensure: present
+
diff --git a/modules/upstream/realmd/data/common.yaml b/modules/upstream/realmd/data/common.yaml
@@ -14,6 +14,8 @@ realmd::sssd_config_file: /etc/sssd/sssd.conf
 realmd::sssd_config: {}
 realmd::sssd_config_cache_file: /var/lib/sss/db/config.ldb
 realmd::manage_sssd_config: false
+realmd::manage_sssd_service: true
+realmd::manage_sssd_package: true
 realmd::domain: "%{::domain}"
 realmd::domain_join_user: ~
 realmd::domain_join_password: ~
diff --git a/modules/upstream/realmd/hiera.yaml b/modules/upstream/realmd/hiera.yaml
@@ -1,10 +1,12 @@
 ---
-version: 4
-datadir: data
+version: 5
+defaults:
+  datadir: data
+  data_hash: yaml_data
+
 hierarchy:
   - name: "Operating System Family"
-    backend: yaml
-    path: "%{facts.os.family}"
+    path: "%{facts.os.family}.yaml"
 
   - name: "common"
-    backend: yaml
+    path: "common.yaml"
diff --git a/modules/upstream/realmd/manifests/init.pp b/modules/upstream/realmd/manifests/init.pp
@@ -28,6 +28,8 @@
   Stdlib::Absolutepath $sssd_config_cache_file,
   Hash $sssd_config,
   Boolean $manage_sssd_config,
+  Boolean $manage_sssd_service,
+  Boolean $manage_sssd_package,
   String $domain,
   String $netbiosname,
   Variant[String, Undef] $domain_join_user,
@@ -41,7 +43,7 @@
   Variant[String, Undef] $ou,
   Hash $required_packages,
   Variant[Array, Undef] $extra_join_options,
-  Variant[String[1, 15], Undef] $computer_name,
+  Variant[String[1, 15], Undef, Boolean[false]] $computer_name,
 ) {
 
   if $krb_ticket_join == false {
@@ -64,10 +66,19 @@
     fail('The krb_config parameter cannot be an empty hash when managing the Kerberos client configuration')
   }
 
-  class { '::realmd::install': }
-  -> class { '::realmd::config': }
-  ~> class { '::realmd::join': }
-  -> class { '::realmd::sssd::config': }
-  ~> class { '::realmd::sssd::service': }
+  contain 'realmd::install'
+  contain 'realmd::config'
+  contain 'realmd::join'
+  contain 'realmd::sssd::config'
+
+  Class['realmd::install']
+  -> Class['realmd::config']
+  ~> Class['realmd::join']
+  -> Class['realmd::sssd::config']
+
+  if $manage_sssd_service {
+    contain 'realmd::sssd::service'
+    Class['realmd::sssd::config'] ~> Class['realmd::sssd::service']
+  }
 
 }
diff --git a/modules/upstream/realmd/manifests/install.pp b/modules/upstream/realmd/manifests/install.pp
@@ -16,10 +16,38 @@
     ensure => $::realmd::krb_client_package_ensure,
   }
 
-  package { $::realmd::sssd_package_name:
-    ensure => $::realmd::sssd_package_ensure,
+  if $realmd::manage_sssd_package {
+    package { $::realmd::sssd_package_name:
+      ensure => $::realmd::sssd_package_ensure,
+    }
   }
 
-  ensure_packages($::realmd::required_packages)
+  case $facts['os']['name'] {
+    'Ubuntu': {
+      include apt
+
+      Exec['apt_update']
+      -> Package[[
+        $::realmd::realmd_package_name,
+        $::realmd::adcli_package_name,
+        $::realmd::adcli_package_name,
+        $::realmd::krb_client_package_name,
+      ]]
+
+      if $realmd::manage_sssd_package {
+        Exec['apt_update'] -> Package[$::realmd::sssd_package_name]
+      }
+
+      $::realmd::required_packages.each | String $package, Hash $content | {
+        Exec['apt_update']
+        -> package { $package:
+          ensure  => $content['ensure'],
+        }
+      }
+    }
+    default: {
+      ensure_packages($::realmd::required_packages)
+    }
+  }
 
 }
diff --git a/modules/upstream/realmd/manifests/join/one_time_password.pp b/modules/upstream/realmd/manifests/join/one_time_password.pp
@@ -2,7 +2,7 @@
 #
 # This class is called from realmd for
 # joining AD using a username and password.
-# The default password for Windows ADS is 
+# The default password for Windows ADS is
 # "the first 15 chars of the hostname in lowercase"
 #
 class realmd::join::one_time_password {
@@ -35,23 +35,17 @@
     }
   }
 
-  if $::operatingsystem == 'Ubuntu' and $facts['os']['distro']['codename']  == 'xenial' {
-    $_computer_name_arg  = ''
-  } else {
-      $_computer_name_arg = ["--computer-name=${_netbiosname}"]
-  }
-
   if !empty($_netbiosname) {
     $_check_pricipal = $_netbiosname
     $_domain_args = ["--domain=${_domain}", "--user-principal=host/${_fqdn}@${_realm}",
-                    '--login-type=computer', $_computer_name_arg]
+                    '--login-type=computer', "--computer-name=${_netbiosname}"]
   } else {
     $_check_pricipal = $::hostname[0,15]
     $_domain_args = ["--domain=${_domain}", "--user-principal=host/${_fqdn}@${_realm}", '--login-type=computer']
   }
 
   if $_ou != undef {
-      $_ou_args=["--computer-ou='OU=${_ou}'"]
+      $_ou_args=["--computer-ou='${_ou}'"]
   }
   else {
       $_ou_args=[]
diff --git a/modules/upstream/realmd/manifests/join/password.pp b/modules/upstream/realmd/manifests/join/password.pp
@@ -17,10 +17,19 @@
     $_computer_name = $::hostname[0,15]
   }
 
-  if $::operatingsystem == 'Ubuntu' and $facts['os']['distro']['codename']  == 'xenial' {
-    $_computer_name_arg  = ''
-  } else {
-      $_computer_name_arg = ["--computer-name=${_computer_name}"]
+  if $::operatingsystem == 'Ubuntu'  {
+      $_computer_name_arg  = $facts['os']['distro']['codename'] ? {
+      'xenial'  => '',
+      'bionic'  => '',
+      'focal'   => '',
+      'jammy'   => '',
+      default => ["--computer-name=${_computer_name}"],
+    }
+  } elsif ($facts['os']['family'] == 'RedHat' and Integer($facts['os']['release']['major']) >= 8)  {
+    $_computer_name_arg = ''
+  }
+  else {
+    $_computer_name_arg = ["--computer-name=${_computer_name}"]
   }
 
   if $_ou != undef {
@@ -31,23 +40,29 @@
 
   $_args = strip(join(concat($_realm_args, $_computer_name_arg, $_extra_join_options), ' '))
 
-  file { '/usr/libexec':
-    ensure  => 'directory',
-  }
+  if $facts['os']['release']['major'] == '6' and $facts['os']['family'] == 'RedHat' {
+    $_command = "echo -n ${_password} | adcli join --login-user=${_user} --domain=${_domain} --domain-ou '${_ou}' --computer-name ${_computer_name} --stdin-password" #lint:ignore:140chars
+
+  } else {
+    file { '/usr/libexec':
+      ensure  => 'directory',
+    }
 
-  file { '/usr/libexec/realm_join_with_password':
-    ensure  => file,
-    owner   => '0',
-    group   => '0',
-    mode    => '0755',
-    content => template('realmd/realm_join_with_password.erb'),
+    file { '/usr/libexec/realm_join_with_password':
+      ensure  => file,
+      owner   => '0',
+      group   => '0',
+      mode    => '0755',
+      content => template('realmd/realm_join_with_password.erb'),
+      notify  => Exec['realm_join_with_password'],
+    }
+    $_command = "/usr/libexec/realm_join_with_password realm join ${_args}"
   }
 
   exec { 'realm_join_with_password':
     environment => ["AD_JOIN_PASSWORD=${_password}"],
     path        => '/usr/bin:/usr/sbin:/bin',
-    command     => "/usr/libexec/realm_join_with_password realm join ${_args}",
+    command     => $_command,
     unless      => "klist -k /etc/krb5.keytab | grep -i '${_computer_name}@${_domain}'",
-    require     => File['/usr/libexec/realm_join_with_password'],
   }
 }
diff --git a/modules/upstream/realmd/manifests/sssd/service.pp b/modules/upstream/realmd/manifests/sssd/service.pp
@@ -5,13 +5,16 @@
 #
 class realmd::sssd::service {
 
-  $_sssd_service_name = $::realmd::sssd_service_name
+  if $realmd::manage_sssd_service {
+    $_sssd_service_name = $::realmd::sssd_service_name
 
-  service { $_sssd_service_name:
-    ensure     => running,
-    enable     => true,
-    hasstatus  => true,
-    hasrestart => true,
+    service { $_sssd_service_name:
+      ensure     => running,
+      enable     => true,
+      hasstatus  => true,
+      hasrestart => true,
+    }
   }
 
+
 }
diff --git a/modules/upstream/realmd/metadata.json b/modules/upstream/realmd/metadata.json
