Skip to content

Commit 7f7a682

Browse files
bastelfreakbastelfreak
authored
Merge pull request #833 from voxpupuli/dropubuntu16
Drop EoL Ubuntu 16.04
2 parents 8ad5548 + 64bfcf1 commit 7f7a682

File tree

11 files changed

+11
-87
lines changed

11 files changed

+11
-87
lines changed

‎manifests/web.pp‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
# zabbix frontend 5.x is not supported, among others, on stretch and xenial.
152152
# https://www.zabbix.com/documentation/current/manual/installation/frontend/frontend_on_debian
153153
if $facts['os']['name'] in ['ubuntu', 'debian'] and versioncmp($zabbix_version, '5') >= 0 {
154-
if versioncmp($facts['os']['release']['major'], '16.04') == 0 or versioncmp($facts['os']['release']['major'], '9') == 0 {
154+
if versioncmp($facts['os']['release']['major'], '9') == 0 {
155155
fail("${facts['os']['family']} ${$facts['os']['release']['major']} is not supported for zabbix::web")
156156
}
157157
}
@@ -227,29 +227,7 @@
227227
case $facts['os']['name'] {
228228
'ubuntu', 'debian': {
229229
$zabbix_web_package = 'zabbix-frontend-php'
230-
231-
# Check OS release for proper prefix
232-
case $facts['os']['name'] {
233-
'Ubuntu': {
234-
if versioncmp($facts['os']['release']['major'], '16.04') >= 0 {
235-
$php_db_package = "php-${db}"
236-
}
237-
else {
238-
$php_db_package = "php5-${db}"
239-
}
240-
}
241-
'Debian': {
242-
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
243-
$php_db_package = "php-${db}"
244-
}
245-
else {
246-
$php_db_package = "php5-${db}"
247-
}
248-
}
249-
default: {
250-
$php_db_package = "php5-${db}"
251-
}
252-
}
230+
$php_db_package = "php-${db}"
253231

254232
package { $php_db_package:
255233
ensure => $zabbix_package_state,

‎metadata.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
{
108108
"operatingsystem": "Ubuntu",
109109
"operatingsystemrelease": [
110-
"16.04",
111110
"18.04",
112111
"20.04"
113112
]

‎spec/acceptance/zabbix_application_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_application type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
6+
describe 'zabbix_application type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# 5.2 and 5.4 server packages are not available for RHEL 7
99
next if zabbix_version == '5.2' && default[:platform] == 'el-7-x86_64'

‎spec/acceptance/zabbix_host_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
7+
describe 'zabbix_host type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

‎spec/acceptance/zabbix_hostgroup_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
6+
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

‎spec/acceptance/zabbix_proxy_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
7+
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

‎spec/acceptance/zabbix_template_host_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
6+
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# Zabbix 6.0 removed the ability to attach templates directly to hosts.
99
next if zabbix_version == '6.0'

‎spec/acceptance/zabbix_template_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
6+
describe 'zabbix_template type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

‎spec/classes/repo_spec.rb‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,6 @@
5252

5353
it { is_expected.to contain_apt__source('zabbix').with_location('http://repo.zabbix.com/zabbix/5.0/debian/') }
5454
end
55-
when '16.04'
56-
context 'on Ubuntu 14.04 and Zabbix 5.0' do
57-
let :params do
58-
{
59-
zabbix_version: '5.0',
60-
manage_repo: true
61-
}
62-
end
63-
64-
it { is_expected.to contain_apt__source('zabbix').with_location('http://repo.zabbix.com/zabbix/5.0/ubuntu/') }
65-
end
66-
67-
context 'on Ubuntu 16.04 and Zabbix 4.0' do
68-
let :params do
69-
{
70-
zabbix_version: '4.0',
71-
manage_repo: true
72-
}
73-
end
74-
75-
it { is_expected.to contain_apt__source('zabbix').with_location('http://repo.zabbix.com/zabbix/4.0/ubuntu/') }
76-
end
7755
end
7856
when 'RedHat'
7957

‎spec/classes/web_spec.rb‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
next if facts[:os]['name'] == 'Archlinux'
2121
next if facts[:os]['name'] == 'Gentoo'
2222
next if facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '9'
23-
next if facts[:os]['name'] == 'Ubuntu' && facts[:os]['release']['major'] == '16.04'
2423
# There are no zabbix 5.2 packages for Debian 11
2524
next if facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '11' && zabbix_version == '5.2'
2625

@@ -64,22 +63,7 @@
6463
super().merge(zabbix_version: zabbix_version)
6564
end
6665

67-
pgsqlpackage = case facts[:operatingsystem]
68-
when 'Ubuntu'
69-
if facts[:operatingsystemmajrelease] >= '16.04'
70-
'php-pgsql'
71-
else
72-
'php5-pgsql'
73-
end
74-
when 'Debian'
75-
if facts[:operatingsystemmajrelease].to_i >= 9
76-
'php-pgsql'
77-
else
78-
'php5-pgsql'
79-
end
80-
else
81-
'php5-pgsql'
82-
end
66+
pgsqlpackage = 'php-pgsql'
8367

8468
packages = if facts[:osfamily] == 'RedHat'
8569
if facts[:operatingsystemmajrelease].to_i == 7 &&
@@ -104,22 +88,7 @@
10488
super().merge(database_type: 'mysql')
10589
end
10690

107-
mysqlpackage = case facts[:operatingsystem]
108-
when 'Ubuntu'
109-
if facts[:operatingsystemmajrelease] >= '16.04'
110-
'php-mysql'
111-
else
112-
'php5-mysql'
113-
end
114-
when 'Debian'
115-
if facts[:operatingsystemmajrelease].to_i >= 9
116-
'php-mysql'
117-
else
118-
'php5-mysql'
119-
end
120-
else
121-
'php5-mysql'
122-
end
91+
mysqlpackage = 'php-mysql'
12392

12493
packages = facts[:osfamily] == 'RedHat' ? %w[zabbix-web-mysql zabbix-web] : ['zabbix-frontend-php', mysqlpackage]
12594
packages.each do |package|

0 commit comments

Comments
 (0)