|
52 | 52 |
|
53 | 53 | confine kernel: :linux |
54 | 54 |
|
55 | | - ip6tables_version = Facter.value('ip6tables_version') |
56 | | - mark_flag = if ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.4.1') < 0 |
| 55 | + const_set(:Ip6tables_version, Facter.value('ip6tables_version')) |
| 56 | + mark_flag = if const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.4.1') < 0 |
57 | 57 | '--set-mark' |
58 | 58 | else |
59 | 59 | '--set-xmark' |
60 | 60 | end |
61 | 61 |
|
62 | 62 | kernelversion = Facter.value('kernelversion') |
63 | 63 | if (kernelversion && Puppet::Util::Package.versioncmp(kernelversion, '3.13') >= 0) && |
64 | | - (ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.6.2') >= 0) |
| 64 | + (const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.6.2') >= 0) |
65 | 65 | has_feature :random_fully |
66 | 66 | end |
67 | 67 |
|
68 | 68 | if (kernelversion && Puppet::Util::Package.versioncmp(kernelversion, '3.3') >= 0) && |
69 | | - (ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.4.13') >= 0) |
| 69 | + (const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.4.13') >= 0) |
70 | 70 | has_feature :rpfilter |
71 | 71 | end |
72 | 72 |
|
73 | | - if ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.6.1') >= 0 |
| 73 | + if const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.6.1') >= 0 |
74 | 74 | has_feature :nflog_size |
75 | 75 | end |
76 | 76 |
|
77 | 77 | def initialize(*args) |
78 | | - ip6tables_version = Facter.value('ip6tables_version') |
79 | | - raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables' if ip6tables_version&.match(%r{1\.3\.\d}) |
| 78 | + raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables' if Puppet::Type::Firewall::ProviderIp6tables::Ip6tables_version&.match(%r{1\.3\.\d}) |
80 | 79 | super |
81 | 80 | end |
82 | 81 |
|
|
0 commit comments