From f009ffe1a861302b7ed89a1bad1c48bf4a6ee296 Mon Sep 17 00:00:00 2001 From: John Wong Date: Tue, 11 Jun 2024 10:52:58 -0700 Subject: [PATCH] Reverting dnf module back to yum --- molecule/plus-count-upgrade/converge.yml | 2 +- tasks/clickhouse/install-redhat.yml | 4 ++-- tasks/nms/install-redhat.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/molecule/plus-count-upgrade/converge.yml b/molecule/plus-count-upgrade/converge.yml index bcf1b5f..876a3a6 100644 --- a/molecule/plus-count-upgrade/converge.yml +++ b/molecule/plus-count-upgrade/converge.yml @@ -31,7 +31,7 @@ state: stopped - name: (RedHat) Upgrading nginx-agent - ansible.builtin.dnf: + ansible.builtin.yum: name: nginx-agent state: latest update_only: true diff --git a/tasks/clickhouse/install-redhat.yml b/tasks/clickhouse/install-redhat.yml index 85b3c5d..459d30c 100644 --- a/tasks/clickhouse/install-redhat.yml +++ b/tasks/clickhouse/install-redhat.yml @@ -1,6 +1,6 @@ --- - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Install required packages for ClickHouse - ansible.builtin.dnf: + ansible.builtin.yum: name: "{{ nms_clickhouse_redhat_dependencies }}" - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Add ClickHouse Repository @@ -13,7 +13,7 @@ tags: [install] - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Install ClickHouse - ansible.builtin.dnf: + ansible.builtin.yum: name: - "clickhouse-server{{ (nms_clickhouse_version is not defined or nms_clickhouse_version == '') | ternary('', '-' + nms_clickhouse_version) }}" - "clickhouse-client{{ (nms_clickhouse_version is not defined or nms_clickhouse_version == '') | ternary('', '-' + nms_clickhouse_version) }}" diff --git a/tasks/nms/install-redhat.yml b/tasks/nms/install-redhat.yml index e3aed9e..8f0c1a5 100644 --- a/tasks/nms/install-redhat.yml +++ b/tasks/nms/install-redhat.yml @@ -28,7 +28,7 @@ - item.yum_repo is defined or (nms_module_vals[item.name]['default_centos_yum_repo'] != "") or (nms_module_vals[item.name]['default_amazon_yum_repo'] != "") - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) {{ nms_setup | capitalize }} NGINX Instance Manager - ansible.builtin.dnf: + ansible.builtin.yum: name: "nms-instance-manager{{ (nms_version is not defined or nms_version == '') | ternary('', '-' + nms_version) }}" update_cache: true allow_downgrade: "{{ omit if ansible_version.full is version('2.12', '<') else true }}" @@ -41,7 +41,7 @@ - Restart NGINX - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) {{ nms_setup if item.setup is not defined else item.setup | capitalize }} NMS Modules - ansible.builtin.dnf: + ansible.builtin.yum: name: "{{ nms_module_vals[item.name]['package_name'] }}{{ '' if (item.version is not defined or item.version == '') else '-' + item.version }}" update_cache: true allow_downgrade: "{{ omit if ansible_version.full is version('2.12', '<') else true }}" @@ -69,7 +69,7 @@ - nms_setup | lower != 'uninstall' - name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Get list of installed packages - ansible.builtin.dnf: + ansible.builtin.yum: list: installed register: firewalld_status