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

Jump to bottom

Tests: Changes for running on fedora #6915

Closed
wants to merge 3 commits into from
Closed

Tests: Changes for running on fedora #6915

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e194c1d
Tests: Print krb5.conf when joining realm.
jakub-vavra-cz Sep 5, 2023
8464602
Tests: Split package installation to different transactions.
jakub-vavra-cz Sep 6, 2023
e2031bb
Tests: Handle dns with systemd resolved.
jakub-vavra-cz Sep 6, 2023
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
44 changes: 31 additions & 13 deletions src/tests/multihost/sssd/testlib/common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,42 @@ def client_install_pkgs(self):
""" Install common required packages """
pkgs = 'adcli realmd samba samba-common-tools krb5-workstation '\
'oddjob oddjob-mkhomedir ldb-tools samba-winbind '\
'samba-winbind-clients autofs nfs-utils authconfig '\
'authselect cifs-utils openldap-clients firewalld '\
'tcpdump wireshark-cli expect rsyslog gcc gcc-c++ pam-devel '\
'tdb-tools libkcapi-hmaccalc strace iproute-tc python3-libsss_nss_idmap '
'samba-winbind-clients autofs nfs-utils rsyslog '\
'cifs-utils openldap-clients tdb-tools '\
'tcpdump wireshark-cli expect gcc gcc-c++ pam-devel '\
'libkcapi-hmaccalc strace iproute-tc python3-libsss_nss_idmap'
sssd_pkgs = 'sssd sssd-tools sssd-proxy sssd-winbind-idmap '\
'libsss_autofs sssd-kcm sssd-dbus'
extra_pkg = ' nss-pam-ldapd krb5-pkinit'
distro = self.multihost.distro
if '8.' in distro:
pkgs = pkgs + extra_pkg
if '7.' in distro or '8.' in distro or '9.' in distro:
sssd_pkgs = sssd_pkgs + " libsss_simpleifp"
# Packages that might or might not be available depending on distro
# are installed in own transactions not to prevent others
# to be installed. It is due to difference between yum and dnf when dnf
# does not install anything when one of the packages is missing.
# It can be changed in dnf config by strict=0, but it would be hard to
# do here without a massive refactoring.
standalalone_pkgs = [
'authselect', 'authconfig', 'firewalld', 'libsss_simpleifp',
'nss-pam-ldapd', 'krb5-pkinit'
]
for pkg in standalalone_pkgs:
self.multihost.package_mgmt(pkg, action='install')
self.multihost.package_mgmt(pkgs, action='install')
self.multihost.package_mgmt(sssd_pkgs, action='install')

def server_install_pkgs(self):
""" Install common required packages on server"""
pkgs = 'adcli realmd samba samba-common-tools krb5-workstation '\
'samba-winbind-clients nfs-utils authconfig openldap-clients '\
'authselect krb5-server cifs-utils expect rsyslog 389-ds-base'
'samba-winbind-clients nfs-utils openldap-clients '\
'krb5-server cifs-utils expect 389-ds-base rsyslog'
sssd_pkgs = 'sssd sssd-tools sssd-proxy sssd-winbind-idmap '\
'libsss_autofs libsss_simpleifp sssd-kcm sssd-dbus'
'libsss_autofs sssd-kcm sssd-dbus'
# See comment in client_install_pkgs
standalalone_pkgs = ['authselect', 'authconfig', 'libsss_simpleifp']
distro = self.multihost.distro
if '8.' in distro:
enable_idm = 'yum module enable idm:DL1 -y'
self.multihost.run_command(enable_idm)
for pkg in standalalone_pkgs:
self.multihost.package_mgmt(pkg, action='install')
self.multihost.package_mgmt(pkgs, action='install')
self.multihost.package_mgmt(sssd_pkgs, action='install')

Expand Down Expand Up @@ -143,6 +153,12 @@ def update_resolv_conf(self, ip_addr):
self.multihost.run_command("chattr -i /etc/resolv.conf", raiseonerr=False)
self.multihost.put_file_contents('/etc/resolv.conf', contents)
self.multihost.run_command("chattr +i /etc/resolv.conf", raiseonerr=False)
# Try to change dns settings on a machine with systemd.resolved
change_stub = f"sed -ie 's/#\?DNS=.*/DNS={ip_addr}/' /etc/systemd/resolved.conf"
self.multihost.run_command(change_stub, raiseonerr=False)
self.multihost.run_command(
"systemctl restart systemd-resolved", raiseonerr=False
)

def update_etc_hosts(self, ip_addr, hostname):
""" Update /etc/hosts with ipaddress and hostname
Expand Down Expand Up @@ -401,6 +417,8 @@ def realm_join(self, domainname, admin_password,
self.service_ctrl('stop', 'realmd')
raise SSSDException(f"realm join timed out! {cmd.stderr_text}")
elif cmd.returncode != 0:
self.multihost.run_command("cat /etc/krb5.conf", raiseonerr=False)
self.multihost.run_command("resolvectl dns", raiseonerr=False)
raise SSSDException("Error: %s" % cmd.stderr_text)
else:
return cmd.stderr_text
Expand Down
Loading