Skip to content

Remove RHEL/CentOS 6 parameters given they have reached EOL #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 5, 2021
Merged

Remove RHEL/CentOS 6 parameters given they have reached EOL #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6a20e4
Remove RHEL/CentOS 6 task specific parameters given those platforms h…
alessfg Oct 5, 2021
6b2e732
Merge branch 'main' into remove-rhel6-parameters
alessfg Oct 5, 2021
1445c8b
Update install-modules.yml
alessfg Oct 5, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ENHANCEMENTS:

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

Expand Down
1 change: 0 additions & 1 deletion tasks/keys/setup-keys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@
rpm_key:
fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
key: "{{ keysite }}"
validate_certs: "{{ (ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('false', 'true') }}"
when: ansible_facts['os_family'] in ['RedHat', 'Suse']
3 changes: 1 addition & 2 deletions tasks/modules/install-modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@
or (ansible_facts['distribution'] == "OracleLinux"))
- not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
- not (item.name | default(item) == "opentracing")
or not ((ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('6', '==')))
or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
10 changes: 0 additions & 10 deletions tasks/opensource/install-source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz"
dest: "/tmp/{{ pcre_version }}.tar.gz"
mode: 0600
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
register: pcre_source

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

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

- name: Unpack OpenSSL dependency
Expand Down Expand Up @@ -285,8 +279,6 @@
uri:
url: https://version.nginx.com/nginx/{{ nginx_branch }}
return_content: true
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
check_mode: false
register: nginx_versions

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

- name: Unpack NGINX
Expand Down