Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Fix versionlock centos 8 #797

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix versionlock centos 8 #797

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc8831a
Detect package manager (yum/dnf) and versionlock plugin package name
May 21, 2021
60eb4cc
Invoke detected package manager and versionlock plugin package name
May 21, 2021
45fe5ad
Merge branch 'master' into fix-versionlock-centos-8
brad-x May 26, 2021
22b8e8c
Merge branch 'master' into fix-versionlock-centos-8
brad-x Sep 7, 2021
188a00a
Add clarity to task name and use the package module
Jan 25, 2022
32af3d4
Remove unnecessary distro check and improve readability
Jan 25, 2022
6bb8495
Derive the package manager from ansible_facts
Jan 25, 2022
99a129a
Add comment to the vars file for clarity of purpose
Jan 25, 2022
ac59b51
Merge branch 'main' into fix-versionlock-centos-8
brad-x Jan 25, 2022
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
10 changes: 5 additions & 5 deletions tasks/elasticsearch-RedHat-version-lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
- name: RedHat - install yum-version-lock
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yum-version-lock should also be replaced here with {{ versionlock_plugin_package }}.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, fixed

become: yes
yum:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this then better be package to be more generic?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also sensible

name: yum-plugin-versionlock
name: "{{ versionlock_plugin_package }}"
state: present
update_cache: yes

- name: RedHat - check if requested elasticsearch version lock exists
become: yes
shell: 'yum versionlock list | grep {{es_package_name}} | grep -c "{{es_version}}"'
shell: '{{ package_manager }} versionlock list | grep {{ es_package_name }} | grep -c "{{ es_version }}"'
register: es_requested_version_locked
args:
warn: false
Expand All @@ -18,7 +18,7 @@

- name: RedHat - lock elasticsearch version
become: yes
shell: yum versionlock delete 0:elasticsearch* ; yum versionlock add {{ es_package_name }}-{{ es_version }}
command: '"{{ package_manager }}" versionlock delete 0:elasticsearch* ; "{{ package_manager }}" versionlock add {{ es_package_name }}-{{ es_version }}'
args:
warn: false
when:
Expand All @@ -28,7 +28,7 @@

- name: RedHat - check if any elasticsearch version lock exists
become: yes
shell: yum versionlock list | grep -c elasticsearch
shell: '"{{ package_manager }}" versionlock list | grep -c elasticsearch'
register: es_version_locked
args:
warn: false
Expand All @@ -38,7 +38,7 @@

- name: RedHat - unlock elasticsearch version
become: yes
shell: yum versionlock delete 0:elasticsearch*
shell: '"{{ package_manager }}" versionlock delete 0:elasticsearch*'
args:
warn: false
when:
Expand Down
2 changes: 2 additions & 0 deletions vars/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
java: "{{ es_java | default('java-1.8.0-openjdk.x86_64') }}"
default_file: "/etc/sysconfig/elasticsearch"
es_home: "/usr/share/elasticsearch"
package_manager: "{% if ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '8' %}dnf{% else %}yum{% endif %}"
Copy link
Contributor

@darxriggs darxriggs Oct 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better use ansible_distribution_major_version | int >= 8 or ansible_distribution_version is version('8', '>=') because for higher version numbers this comparison is not returning the expected result, e.g. '10' >= '8' evaluates to false.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ansible_os_family should not be required here because this file is only included in tasks/main.yml using ansible_os_family to derive the filename.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I primarily didn't want to diverge too far from existing statements in e.g. Debian.yml which has the same unnecessary check. But I'll remove it here as it's been discussed (I'm leaving it in Debian.yml for now though as I haven't tested there)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I've just removed all that and gone with ansible_facts.pkg_mgr to simplify things.

versionlock_plugin_package: "{% if ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '8' %}python3-dnf-plugin-versionlock{% else %}yum-plugin-versionlock{% endif %}"