From 363aeaa27af4b6deb44d063b54ba5d5db4b63d24 Mon Sep 17 00:00:00 2001 From: Jayesh Kumar Date: Fri, 25 Aug 2023 14:57:47 +0530 Subject: [PATCH 1/2] Made OS version and distrubution as global variable Signed-off-by: Jayesh Kumar --- roles/mrot_config/tasks/common.yaml | 20 +++++++++----------- roles/mrot_config/vars/main.yaml | 12 +++++++++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/roles/mrot_config/tasks/common.yaml b/roles/mrot_config/tasks/common.yaml index 6754292d..8d6b7f5f 100644 --- a/roles/mrot_config/tasks/common.yaml +++ b/roles/mrot_config/tasks/common.yaml @@ -38,16 +38,12 @@ # To check and install NetworkManager-dispatcher-routing-rules on cluster nodes and post that enable and start it. -- name: Get RHEL version - shell: cat /etc/redhat-release | grep -oE '[0-9]+\.[0-9]+' | head -1 - register: rhel_version_output - -- debug: - var: rhel_version_output.stdout_lines[0] - -- name: Parse RHEL version - set_fact: - rhel_version: "{{ rhel_version_output.stdout_lines[0] }}" +- name: Debug | Display distribution and version + debug: + var: item + with_items: + - ansible_distribution + - ansible_distribution_version - name: Install tasks block for RHEL block: @@ -75,4 +71,6 @@ name: NetworkManager-dispatcher state: started when: nmd_installed.changed == true - when: rhel_version in ["7.9", "8.6"] and 'RedHat' in ansible_facts.distribution + when: + - ansible_distribution in scale_rhel_distribution + - ansible_distribution_version in scale_rhel_version \ No newline at end of file diff --git a/roles/mrot_config/vars/main.yaml b/roles/mrot_config/vars/main.yaml index fb6147e7..cddad7dd 100644 --- a/roles/mrot_config/vars/main.yaml +++ b/roles/mrot_config/vars/main.yaml @@ -2,4 +2,14 @@ # Interface names scale_pri_interface_name: "eth0" -scale_sec_interface_name: "eth1" \ No newline at end of file +scale_sec_interface_name: "eth1" + +# Supported scale OS distrubution +scale_rhel_distribution: + - RedHat + - CentOS + +# Supported version RHEL OS +scale_rhel_version: + - "7.9" + - "8.6" \ No newline at end of file From f45b4f112cb2f75f68ebdcb14dc730265af208e0 Mon Sep 17 00:00:00 2001 From: Jayesh Kumar Date: Fri, 25 Aug 2023 17:06:01 +0530 Subject: [PATCH 2/2] Update debug Signed-off-by: Jayesh Kumar --- roles/mrot_config/tasks/common.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/mrot_config/tasks/common.yaml b/roles/mrot_config/tasks/common.yaml index 8d6b7f5f..7516ff91 100644 --- a/roles/mrot_config/tasks/common.yaml +++ b/roles/mrot_config/tasks/common.yaml @@ -38,12 +38,14 @@ # To check and install NetworkManager-dispatcher-routing-rules on cluster nodes and post that enable and start it. -- name: Debug | Display distribution and version +- name: debug | Display OS distribution debug: - var: item - with_items: - - ansible_distribution - - ansible_distribution_version + var: ansible_distribution + +- name: debug | Display OS version + debug: + var: ansible_distribution_version + - name: Install tasks block for RHEL block: