saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed support for RHEL 5

Browse source
This commit is contained in:
David Murphy 2023-06-15 13:44:57 -06:00 • committed by Pedro Algarvio
parent 4cfc91da62
commit 2478e75dca
3 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62520.removed.md Normal file
View file

@ -0,0 +1 @@
Removed RHEL 5 support since long since end-of-lifed

24
salt/modules/groupadd.py
View file

@ -286,19 +286,13 @@ def adduser(name, username, root=None):
Verifies if a valid username 'bar' as a member of an existing group 'foo',
if not then adds it.
"""
on_redhat_5 = (
__grains__.get("os_family") == "RedHat"
and __grains__.get("osmajorrelease") == "5"
)
on_suse_11 = (
__grains__.get("os_family") == "Suse"
and __grains__.get("osmajorrelease") == "11"
)
if __grains__["kernel"] == "Linux":
if on_redhat_5:
cmd = [_which("gpasswd"), "-a", username, name]
elif on_suse_11:
if on_suse_11:
cmd = [_which("usermod"), "-A", name, username]
else:
cmd = [_which("gpasswd"), "--add", username, name]
@ -336,10 +330,6 @@ def deluser(name, username, root=None):
Removes a member user 'bar' from a group 'foo'. If group is not present
then returns True.
"""
on_redhat_5 = (
__grains__.get("os_family") == "RedHat"
and __grains__.get("osmajorrelease") == "5"
)
on_suse_11 = (
__grains__.get("os_family") == "Suse"
and __grains__.get("osmajorrelease") == "11"
@ -349,9 +339,7 @@ def deluser(name, username, root=None):
try:
if username in grp_info["members"]:
if __grains__["kernel"] == "Linux":
if on_redhat_5:
cmd = [_which("gpasswd"), "-d", username, name]
elif on_suse_11:
if on_suse_11:
cmd = [_which("usermod"), "-R", name, username]
else:
cmd = [_which("gpasswd"), "--del", username, name]
@ -400,19 +388,13 @@ def members(name, members_list, root=None):
Replaces a membership list for a local group 'foo'.
foo:x:1234:user1,user2,user3,...
"""
on_redhat_5 = (
__grains__.get("os_family") == "RedHat"
and __grains__.get("osmajorrelease") == "5"
)
on_suse_11 = (
__grains__.get("os_family") == "Suse"
and __grains__.get("osmajorrelease") == "11"
)
if __grains__["kernel"] == "Linux":
if on_redhat_5:
cmd = [_which("gpasswd"), "-M", members_list, name]
elif on_suse_11:
if on_suse_11:
for old_member in __salt__["group.info"](name).get("members"):
__salt__["cmd.run"](
"{} -R {} {}".format(_which("groupmod"), old_member, name),

6
salt/modules/yumpkg.py
View file

@ -258,11 +258,7 @@ def _versionlock_pkg(grains=None):
elif _yum() == "tdnf":
raise SaltInvocationError("Cannot proceed, no versionlock for tdnf")
else:
return (
"yum-versionlock"
if int(grains.get("osmajorrelease")) == 5
else "yum-plugin-versionlock"
)
return "yum-plugin-versionlock"
def _check_versionlock():