Skip to content

Commit 6a62778

Browse files
LukasAudLukasAud
committed
missed facts bugfix
1 parent b0fe475 commit 6a62778

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎manifests/params.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
$config_file = '/etc/my.cnf'
341341
$includedir = undef
342342
$datadir = '/var/mysql'
343-
$log_error = "/var/mysql/${facts['os']['hostname']}.err"
343+
$log_error = "/var/mysql/${facts['networking']['hostname']}.err"
344344
$pidfile = '/var/mysql/mysql.pid'
345345
$root_group = 'wheel'
346346
$mysql_group = '_mysql'

‎spec/acceptance/05_mysql_xtrabackup_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class { 'mysql::server': root_password => 'password' }
4040
/RedHat/: {
4141
# RHEL/CentOS 5 is no longer supported by Percona, but older versions
4242
# of the repository are still available.
43-
if versioncmp($::operatingsystemmajrelease, '6') >= 0 {
43+
if versioncmp($facts['os']['release']['major'], '6') >= 0 {
4444
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
4545
$epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
4646
} else {

‎spec/classes/mysql_backup_xtrabackup_spec.rb‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,25 @@ class { 'mysql::server': }
3737
)
3838
end
3939

40-
package = if facts[:osfamily] == 'RedHat'
41-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
40+
package = if facts[:os]['family'] == 'RedHat'
41+
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
4242
'percona-xtrabackup-24'
43-
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
43+
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
4444
'percona-xtrabackup'
4545
else
4646
'percona-xtrabackup-20'
4747
end
48-
elsif facts[:operatingsystem] == 'Debian'
48+
elsif facts[:os]['name'] == 'Debian'
4949
'percona-xtrabackup-24'
50-
elsif facts[:operatingsystem] == 'Ubuntu'
51-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
50+
elsif facts[:os]['name'] == 'Ubuntu'
51+
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '20') >= 0
5252
'percona-xtrabackup-24'
53-
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
53+
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '16') >= 0
5454
'percona-xtrabackup'
5555
else
5656
'percona-xtrabackup-24'
5757
end
58-
elsif facts[:osfamily] == 'Suse'
58+
elsif facts[:os]['family'] == 'Suse'
5959
'xtrabackup'
6060
else
6161
'percona-xtrabackup'
@@ -75,7 +75,7 @@ class { 'mysql::server': }
7575
end
7676

7777
it 'contains the daily cronjob for weekdays 1-6' do
78-
dateformat = case facts[:osfamily]
78+
dateformat = case facts[:os]['name']
7979
when 'FreeBSD', 'OpenBSD'
8080
'$(date -v-sun +\%F)_full'
8181
else
@@ -114,8 +114,8 @@ class { 'mysql::server': }
114114
user: 'backupuser@localhost',
115115
table: '*.*',
116116
privileges:
117-
if (facts[:operatingsystem] == 'Debian' && Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '11') >= 0) ||
118-
(facts[:operatingsystem] == 'Ubuntu' && Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '22') >= 0)
117+
if (facts[:os]['name'] == 'Debian' && Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '11') >= 0) ||
118+
(facts[:os]['name'] == 'Ubuntu' && Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '22') >= 0)
119119
['BINLOG MONITOR', 'RELOAD', 'PROCESS', 'LOCK TABLES']
120120
else
121121
['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT']
@@ -157,8 +157,8 @@ class { 'mysql::server': }
157157
user: 'backupuser@localhost',
158158
table: '*.*',
159159
privileges:
160-
if (facts[:operatingsystem] == 'Debian' && Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '11') >= 0) ||
161-
(facts[:operatingsystem] == 'Ubuntu' && Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '22') >= 0)
160+
if (facts[:os]['name'] == 'Debian' && Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '11') >= 0) ||
161+
(facts[:os]['name'] == 'Ubuntu' && Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '22') >= 0)
162162
['BINLOG MONITOR', 'RELOAD', 'PROCESS', 'LOCK TABLES', 'BACKUP_ADMIN']
163163
else
164164
['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT', 'BACKUP_ADMIN']
@@ -193,31 +193,31 @@ class { 'mysql::server': }
193193
{ additional_cron_args: '--backup --skip-ssl' }.merge(default_params)
194194
end
195195

196-
package = if facts[:osfamily] == 'RedHat'
197-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
196+
package = if facts[:os]['family'] == 'RedHat'
197+
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
198198
'percona-xtrabackup-24'
199-
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
199+
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
200200
'percona-xtrabackup'
201201
else
202202
'percona-xtrabackup-20'
203203
end
204-
elsif facts[:operatingsystem] == 'Debian'
204+
elsif facts[:os]['name'] == 'Debian'
205205
'percona-xtrabackup-24'
206-
elsif facts[:operatingsystem] == 'Ubuntu'
207-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
206+
elsif facts[:os]['name'] == 'Ubuntu'
207+
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '20') >= 0
208208
'percona-xtrabackup-24'
209-
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
209+
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '16') >= 0
210210
'percona-xtrabackup'
211211
else
212212
'percona-xtrabackup-24'
213213
end
214-
elsif facts[:osfamily] == 'Suse'
214+
elsif facts[:os]['family'] == 'Suse'
215215
'xtrabackup'
216216
else
217217
'percona-xtrabackup'
218218
end
219219

220-
dateformat = case facts[:osfamily]
220+
dateformat = case facts[:os]['family']
221221
when 'FreeBSD', 'OpenBSD'
222222
'$(date -v-sun +\%F)_full'
223223
else

‎spec/classes/mysql_bindings_spec.rb‎

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

55
describe 'mysql::bindings' do
66
on_supported_os.each do |os, facts|
7-
next if facts[:osfamily] == 'Archlinux'
7+
next if facts[:os]['family'] == 'Archlinux'
88
context "on #{os}" do
99
let(:facts) do
1010
facts.merge(root_home: '/root')

0 commit comments

Comments
 (0)