Skip to content

Commit 3f101ba

Browse files
authored
Remove RHEL/CentOS 6 parameters given they have reached EOL (#451)
1 parent 5dbbe39 commit 3f101ba

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
ENHANCEMENTS:
66

7+
* Remove RHEL/CentOS 6 task specific parameters given those platforms have reached EOL.
78
* Change Ansible Lint exceptions from using an ID identifier to a text identifier.
89
* Move non NGINX specific dependencies from the role into the Molecule Dockerfile.
910

tasks/keys/setup-keys.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@
2727
rpm_key:
2828
fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
2929
key: "{{ keysite }}"
30-
validate_certs: "{{ (ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('false', 'true') }}"
3130
when: ansible_facts['os_family'] in ['RedHat', 'Suse']

tasks/modules/install-modules.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@
3030
or (ansible_facts['distribution'] == "OracleLinux"))
3131
- not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
3232
- not (item.name | default(item) == "opentracing")
33-
or not ((ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
34-
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('6', '==')))
33+
or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))

tasks/opensource/install-source.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@
130130
url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz"
131131
dest: "/tmp/{{ pcre_version }}.tar.gz"
132132
mode: 0600
133-
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
134-
| ternary('false', 'true') }}"
135133
register: pcre_source
136134

137135
- name: Unpack PCRE dependency
@@ -190,8 +188,6 @@
190188
url: "https://zlib.net/{{ zlib_version }}.tar.gz"
191189
dest: "/tmp/{{ zlib_version }}.tar.gz"
192190
mode: 0600
193-
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
194-
| ternary('false', 'true') }}"
195191
register: zlib_source
196192

197193
- name: Unpack ZLib dependency
@@ -250,8 +246,6 @@
250246
url: "https://www.openssl.org/source/{{ openssl_version }}.tar.gz"
251247
dest: "/tmp/{{ openssl_version }}.tar.gz"
252248
mode: 0600
253-
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
254-
| ternary('false', 'true') }}"
255249
register: openssl_source
256250

257251
- name: Unpack OpenSSL dependency
@@ -285,8 +279,6 @@
285279
uri:
286280
url: https://version.nginx.com/nginx/{{ nginx_branch }}
287281
return_content: true
288-
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
289-
| ternary('false', 'true') }}"
290282
check_mode: false
291283
register: nginx_versions
292284

@@ -311,8 +303,6 @@
311303
url: "https://nginx.org/download/{{ nginx_version }}.tar.gz"
312304
dest: "/tmp/{{ nginx_version }}.tar.gz"
313305
mode: 0600
314-
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
315-
| ternary('false', 'true') }}"
316306
register: nginx_source
317307

318308
- name: Unpack NGINX

0 commit comments

Comments
 (0)