Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/requirements/requirements_galaxy.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ansible-core==2.12.4
ansible-core==2.12.5
2 changes: 1 addition & 1 deletion .github/workflows/requirements/requirements_molecule.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ansible-core==2.12.4
ansible-core==2.12.5
jinja2==3.1.1
ansible-lint==6.0.2
yamllint==1.26.3
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

BUG FIXES:

Ensure gpg-agent is installed on Ubuntu/Debian to avoid APT key tasks failures.
* Ensure gpg-agent is installed on Ubuntu/Debian to avoid APT key tasks failures.
* Always refresh the `yum` cache.

## 0.23.1 (April 6, 2022)

Expand Down
4 changes: 0 additions & 4 deletions molecule/downgrade/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
- name: Converge
hosts: all
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: "=1.20.2-r1"
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: "=1.20.2-1~{{ ansible_facts['distribution_release'] }}"
Expand Down
28 changes: 0 additions & 28 deletions molecule/downgrade/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ lint: |
yamllint .
ansible-lint --force-color
platforms:
- name: alpine-3.12
image: alpine:3.12
dockerfile: ../common/Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/sbin/init"
- name: alpine-3.13
image: alpine:3.13
dockerfile: ../common/Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/sbin/init"
- name: alpine-3.14
image: alpine:3.14
dockerfile: ../common/Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/sbin/init"
- name: alpine-3.15
image: alpine:3.15
dockerfile: ../common/Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/sbin/init"
- name: amazonlinux-2
image: amazonlinux:2
dockerfile: ../common/Dockerfile.j2
Expand Down
5 changes: 5 additions & 0 deletions tasks/opensource/install-redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
state: "{{ (nginx_state == 'uninstall') | ternary('absent', 'present') }}"
when: nginx_manage_repo | bool

- name: (Amazon Linux/CentOS/RHEL) Force Yum cache refresh
ansible.builtin.command: yum clean metadata
when: nginx_manage_repo | bool
changed_when: false

- name: (Amazon Linux/CentOS/RHEL) {{ nginx_setup | capitalize }} NGINX
ansible.builtin.yum:
name: "nginx{{ nginx_version | default('') }}"
Expand Down
5 changes: 5 additions & 0 deletions tasks/plus/install-redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
mode: 0644
when: nginx_manage_repo | bool

- name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Force Yum cache refresh
ansible.builtin.command: yum clean metadata
when: nginx_manage_repo | bool
changed_when: false

- name: (Amazon Linux/CentOS/Oracle Linux/RHEL) {{ nginx_setup | capitalize }} NGINX Plus
ansible.builtin.yum:
name: "nginx-plus{{ nginx_version | default('') }}"
Expand Down