Skip to content

Commit c2609ba

Browse files
committed
Bump Ansible collections (#546)
1 parent ed72fc7 commit c2609ba

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
collections:
33
- name: community.general
4-
version: 5.4.0
4+
version: 5.5.0
55
- name: ansible.posix
66
version: 1.4.0
77
- name: community.crypto
88
version: 2.5.0
99
- name: community.docker
10-
version: 2.7.0
10+
version: 3.1.0

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ENHANCEMENTS:
1414

1515
* Add support for PCRE 2 and OpenSSL 3.0 (built from source) when building NGINX from source.
1616
* Tweak Release Drafter config.
17-
* Bump the Ansible `community.general` collection to `5.4.0`, `ansible.posix` collection to `1.4.0` and `community.docker` collection to `2.7.0`.
17+
* Bump the Ansible `community.general` collection to `5.5.0`, `ansible.posix` collection to `1.4.0` and `community.docker` collection to `3.1.0`.
1818
* Re-add Alpine Linux tests to `downgrade` Molecule scenarios.
1919

2020
BUG FIXES:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
2525
---
2626
collections:
2727
- name: community.general
28-
version: 5.4.0
28+
version: 5.5.0
2929
- name: ansible.posix
3030
version: 1.4.0
3131
- name: community.crypto # Only required if you plan to install NGINX Plus
3232
version: 2.5.0
3333
- name: community.docker # Only required if you plan to use Molecule (see below)
34-
version: 2.7.0
34+
version: 3.1.0
3535
```
3636
3737
**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.

molecule/downgrade_plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
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
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

molecule/plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
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
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

molecule/uninstall_plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
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
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

molecule/upgrade_plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
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
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
ansible.builtin.assert:
44
that: (nginx_type == "opensource" and ansible_facts['distribution'] in nginx_distributions)
55
or (nginx_type == "plus" and ansible_facts['distribution'] in nginx_plus_distributions)
6-
success_msg: Your OS, {{ ansible_facts['distribution'] }} is supported by NGINX {{ (nginx_type=='plus') | ternary('Plus', 'Open Source') }}
7-
fail_msg: Your OS, {{ ansible_facts['distribution'] }} is not supported by NGINX {{ (nginx_type=='plus') | ternary('Plus', 'Open Source') }}
6+
success_msg: Your OS, {{ ansible_facts['distribution'] }} is supported by NGINX {{ (nginx_type == 'plus') | ternary('Plus', 'Open Source') }}
7+
fail_msg: Your OS, {{ ansible_facts['distribution'] }} is not supported by NGINX {{ (nginx_type == 'plus') | ternary('Plus', 'Open Source') }}
88
when:
99
- nginx_enable | bool
1010
- (nginx_install_from == "nginx_repository" or nginx_type == "plus")

tasks/plus/install-freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
PKG_ENV: { SSL_NO_VERIFY_PEER: "1",
77
SSL_CLIENT_CERT_FILE: "/etc/ssl/nginx/nginx-repo.crt",
88
SSL_CLIENT_KEY_FILE: "/etc/ssl/nginx/nginx-repo.key" }
9-
state: "{{ nginx_license_status | default ('present') }}"
9+
state: "{{ nginx_license_status | default('present') }}"
1010

1111
- name: (FreeBSD) {{ nginx_license_status is defined | ternary('Remove', 'Configure') }} NGINX Plus repository
1212
ansible.builtin.blockinfile:
@@ -18,7 +18,7 @@
1818
ENABLED: yes
1919
MIRROR_TYPE: SRV
2020
}
21-
state: "{{ nginx_license_status | default ('present') }}"
21+
state: "{{ nginx_license_status | default('present') }}"
2222
mode: 0644
2323
when: nginx_manage_repo | bool
2424

0 commit comments

Comments
 (0)