Skip to content

Commit ff7ade6

Browse files
Bump ansible-lint from 5.4.0 to 6.0.1 in /.github/workflows/requirements (#499)
1 parent e6f5dda commit ff7ade6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+190
-190
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ansible-core==2.12.3
22
jinja2==3.0.3
3-
ansible-lint==5.4.0
3+
ansible-lint==6.0.1
44
yamllint==1.26.3
55
molecule[docker]==3.6.1
66
docker==5.0.3

handlers/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- name: (Handler) Systemd daemon-reload
3-
systemd:
3+
ansible.builtin.systemd:
44
daemon_reload: true
55

66
- name: (Handler) Start/reload NGINX
7-
service:
7+
ansible.builtin.service:
88
name: nginx
99
state: reloaded
1010
enabled: true
@@ -15,7 +15,7 @@
1515
listen: (Handler) Run NGINX
1616

1717
- name: (Handler) Check NGINX
18-
command: nginx -t
18+
ansible.builtin.command: nginx -t
1919
args:
2020
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
2121
register: config_check
@@ -26,7 +26,7 @@
2626
listen: (Handler) Run NGINX
2727

2828
- name: (Handler) Print NGINX error if syntax check fails
29-
debug:
29+
ansible.builtin.debug:
3030
var: config_check.stderr_lines
3131
failed_when: config_check.rc != 0
3232
when:
@@ -37,9 +37,9 @@
3737
listen: (Handler) Run NGINX
3838

3939
- name: (Handler) Start NGINX Amplify agent
40-
service:
40+
ansible.builtin.service:
4141
name: amplify-agent
4242
state: started
4343

4444
- name: (Handler) Run logrotate
45-
command: logrotate -f /etc/logrotate.d/nginx
45+
ansible.builtin.command: logrotate -f /etc/logrotate.d/nginx

molecule/default/converge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
hosts: all
44
pre_tasks:
55
- name: Set repo if Alpine
6-
set_fact:
6+
ansible.builtin.set_fact:
77
version: "=1.21.5-r1"
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
10-
set_fact:
10+
ansible.builtin.set_fact:
1111
version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}"
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
14-
set_fact:
14+
ansible.builtin.set_fact:
1515
version: "-1.21.5-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX
19-
include_role:
19+
ansible.builtin.include_role:
2020
name: ansible-role-nginx
2121
vars:
2222
nginx_version: "{{ version }}"

molecule/default/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,12 +20,12 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Verify NGINX is up and running
23-
uri:
23+
ansible.builtin.uri:
2424
url: http://localhost
2525
status_code: 200
2626

2727
- name: Verify correct version of NGINX has been installed
28-
command: nginx -v
28+
ansible.builtin.command: nginx -v
2929
args:
3030
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
3131
changed_when: false

molecule/downgrade/converge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
hosts: all
44
pre_tasks:
55
- name: Set repo if Alpine
6-
set_fact:
6+
ansible.builtin.set_fact:
77
version: "=1.20.2-r1"
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
10-
set_fact:
10+
ansible.builtin.set_fact:
1111
version: "=1.20.2-1~{{ ansible_facts['distribution_release'] }}"
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
14-
set_fact:
14+
ansible.builtin.set_fact:
1515
version: "-1.20.2-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX
19-
include_role:
19+
ansible.builtin.include_role:
2020
name: ansible-role-nginx
2121
vars:
2222
nginx_version: "{{ version }}"

molecule/downgrade/prepare.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
hosts: all
44
pre_tasks:
55
- name: Set repo if Alpine
6-
set_fact:
6+
ansible.builtin.set_fact:
77
version: "=1.21.5-r1"
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
10-
set_fact:
10+
ansible.builtin.set_fact:
1111
version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}"
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
14-
set_fact:
14+
ansible.builtin.set_fact:
1515
version: "-1.21.5-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX
19-
include_role:
19+
ansible.builtin.include_role:
2020
name: ansible-role-nginx
2121
vars:
2222
nginx_version: "{{ version }}"

molecule/downgrade/verify.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,14 +20,14 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Verify NGINX is up and running
23-
uri:
23+
ansible.builtin.uri:
2424
url: http://localhost
2525
status_code: 200
2626

27-
# - name: Verify NGINX has been downgraded
28-
# command: nginx -v
29-
# args:
30-
# chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
31-
# changed_when: false
32-
# register: version
33-
# failed_when: version is not search('1.21.3')
27+
- name: Verify NGINX has been downgraded
28+
ansible.builtin.command: nginx -v
29+
args:
30+
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
31+
changed_when: false
32+
register: version
33+
failed_when: version is not search('1.20.2')

molecule/module/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX modules
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_modules:

molecule/module/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,6 +20,6 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Verify NGINX is up and running
23-
uri:
23+
ansible.builtin.uri:
2424
url: http://localhost
2525
status_code: 200

molecule/plus/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX Plus
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_type: plus

molecule/plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
gather_facts: false
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
7-
copy:
7+
ansible.builtin.copy:
88
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
14-
copy:
14+
ansible.builtin.copy:
1515
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false

molecule/plus/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX Plus is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx-plus
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX Plus service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,6 +20,6 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Verify NGINX Plus is up and running
23-
uri:
23+
ansible.builtin.uri:
2424
url: http://localhost
2525
status_code: 200

molecule/source/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX from source
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_install_from: source

molecule/source/verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX service is running
6-
service:
6+
ansible.builtin.service:
77
name: nginx
88
state: started
99
enabled: true
@@ -12,6 +12,6 @@
1212
failed_when: (service is changed) or (service is failed)
1313

1414
- name: Verify NGINX is up and running
15-
uri:
15+
ansible.builtin.uri:
1616
url: http://localhost
1717
status_code: 200

molecule/uninstall/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Uninstall NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_setup: uninstall

molecule/uninstall/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx

molecule/uninstall/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: absent
99
check_mode: true

molecule/uninstall_plus/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Uninstall NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_type: plus

molecule/uninstall_plus/prepare.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
gather_facts: false
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
7-
copy:
7+
ansible.builtin.copy:
88
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
14-
copy:
14+
ansible.builtin.copy:
1515
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
@@ -21,7 +21,7 @@
2121
hosts: all
2222
tasks:
2323
- name: Install NGINX
24-
include_role:
24+
ansible.builtin.include_role:
2525
name: ansible-role-nginx
2626
vars:
2727
nginx_type: plus

molecule/uninstall_plus/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx-plus
88
state: absent
99
check_mode: true

molecule/upgrade/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx
88
vars:
99
nginx_setup: upgrade

0 commit comments

Comments
 (0)