From 9a9cd19ee458e45fdf03f86de845f1e57c5f1957 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 16:55:27 +0000 Subject: [PATCH 1/7] Bump ansible-core in /.github/workflows/requirements Bumps [ansible-core](https://github.com/ansible/ansible) from 2.16.6 to 2.17.0. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/compare/v2.16.6...v2.17.0) --- updated-dependencies: - dependency-name: ansible-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/requirements/requirements_ansible_lint.txt | 2 +- .github/workflows/requirements/requirements_galaxy.txt | 2 +- .github/workflows/requirements/requirements_molecule.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/requirements/requirements_ansible_lint.txt b/.github/workflows/requirements/requirements_ansible_lint.txt index b2f08e1..f2f6fd3 100644 --- a/.github/workflows/requirements/requirements_ansible_lint.txt +++ b/.github/workflows/requirements/requirements_ansible_lint.txt @@ -1,4 +1,4 @@ -ansible-core==2.16.6 +ansible-core==2.17.0 jinja2==3.1.4 ansible-compat==24.5.1 yamllint==1.35.1 diff --git a/.github/workflows/requirements/requirements_galaxy.txt b/.github/workflows/requirements/requirements_galaxy.txt index 274cf66..5956fd4 100644 --- a/.github/workflows/requirements/requirements_galaxy.txt +++ b/.github/workflows/requirements/requirements_galaxy.txt @@ -1 +1 @@ -ansible-core==2.16.6 +ansible-core==2.17.0 diff --git a/.github/workflows/requirements/requirements_molecule.txt b/.github/workflows/requirements/requirements_molecule.txt index e9eb753..418807f 100644 --- a/.github/workflows/requirements/requirements_molecule.txt +++ b/.github/workflows/requirements/requirements_molecule.txt @@ -1,4 +1,4 @@ -ansible-core==2.16.6 +ansible-core==2.17.0 jinja2==3.1.4 molecule==24.2.1 molecule-plugins[docker]==23.5.3 From 985773089b04da4856d8a072c38d37ccbdb77e52 Mon Sep 17 00:00:00 2001 From: John Wong Date: Thu, 30 May 2024 12:35:49 -0700 Subject: [PATCH 2/7] Resoving lint fail, changing 'ansible.builtin.yum' to 'ansible.builtin.dnf' --- 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 876a3a6..bcf1b5f 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.yum: + ansible.builtin.dnf: name: nginx-agent state: latest update_only: true diff --git a/tasks/clickhouse/install-redhat.yml b/tasks/clickhouse/install-redhat.yml index 459d30c..85b3c5d 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.yum: + ansible.builtin.dnf: 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.yum: + ansible.builtin.dnf: 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 8f0c1a5..e3aed9e 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.yum: + ansible.builtin.dnf: 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.yum: + ansible.builtin.dnf: 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.yum: + ansible.builtin.dnf: list: installed register: firewalld_status From 9fc3bea0278a723e832ac4bde0d36f15aad41e15 Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 10 Jun 2024 15:32:32 -0700 Subject: [PATCH 3/7] Pinning Python requests package --- .github/workflows/requirements/requirements_molecule.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/requirements/requirements_molecule.txt b/.github/workflows/requirements/requirements_molecule.txt index 418807f..661beaf 100644 --- a/.github/workflows/requirements/requirements_molecule.txt +++ b/.github/workflows/requirements/requirements_molecule.txt @@ -4,3 +4,4 @@ molecule==24.2.1 molecule-plugins[docker]==23.5.3 docker==7.1.0 pip>=23.1.2 +requests==2.32.3 From 550258da2cead449061a15789173a5df902f165f Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 10 Jun 2024 15:59:49 -0700 Subject: [PATCH 4/7] Try reverting ansible-core version --- .github/workflows/requirements/requirements_molecule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements/requirements_molecule.txt b/.github/workflows/requirements/requirements_molecule.txt index 661beaf..63c5c7c 100644 --- a/.github/workflows/requirements/requirements_molecule.txt +++ b/.github/workflows/requirements/requirements_molecule.txt @@ -1,4 +1,4 @@ -ansible-core==2.17.0 +ansible-core==2.16.6 jinja2==3.1.4 molecule==24.2.1 molecule-plugins[docker]==23.5.3 From 3da623ba4027b07abf65ed0059e3cfef2dfd1a0f Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 10 Jun 2024 16:12:38 -0700 Subject: [PATCH 5/7] Try to use 'main' version of nginxinx.nginx --- .github/workflows/requirements/requirements_ansible.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/requirements/requirements_ansible.yml b/.github/workflows/requirements/requirements_ansible.yml index 190c42c..2713fc7 100644 --- a/.github/workflows/requirements/requirements_ansible.yml +++ b/.github/workflows/requirements/requirements_ansible.yml @@ -1,7 +1,9 @@ --- roles: - name: nginxinc.nginx - version: 0.24.1 + src: https://github.com/nginxinc/ansible-role-nginx.git + type: git + version: main collections: - name: ansible.posix version: 1.5.4 From f009ffe1a861302b7ed89a1bad1c48bf4a6ee296 Mon Sep 17 00:00:00 2001 From: John Wong Date: Tue, 11 Jun 2024 10:52:58 -0700 Subject: [PATCH 6/7] 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 From aa2640d676091dfaeb5c71567d608fa58933bc60 Mon Sep 17 00:00:00 2001 From: John Wong Date: Tue, 11 Jun 2024 10:57:42 -0700 Subject: [PATCH 7/7] Trying to use legacy dnf instead --- 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 876a3a6..ca5841d 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.yum: + ansible.legacy.dnf: name: nginx-agent state: latest update_only: true diff --git a/tasks/clickhouse/install-redhat.yml b/tasks/clickhouse/install-redhat.yml index 459d30c..3128272 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.yum: + ansible.legacy.dnf: 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.yum: + ansible.legacy.dnf: 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 8f0c1a5..f447a0d 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.yum: + ansible.legacy.dnf: 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.yum: + ansible.legacy.dnf: 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.yum: + ansible.legacy.dnf: list: installed register: firewalld_status