puppet_metadata 3.1.0 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/puppet_metadata/beaker.rb +16 -2
- data/lib/puppet_metadata/operatingsystem.rb +6 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4eeb2df8e93dc5c1eff89ca619a29ca8862bd8c98b3b3862273d05c053a2019c
|
|
4
|
+
data.tar.gz: 9cdb5e2c21fc08c2cba8a9c42ddcec33e0fe326e6b478380e79007c34aeaf1f2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8a637579127e64447e244511f5ba2d459c00fa4587d9e321a32c427ca0e71901088bb67c56d725067b6a3bafaaaa3df898a474803685a05eb6efe6024da612c0
|
|
7
|
+
data.tar.gz: cd7fa183863692be6a0efbbcb46473ace449f11b832490c173d397084c28666b5d83c7ac26e0a56d5d1619b744395e56e1ce08970ae8781b939c32426d9573f6
|
|
@@ -21,6 +21,18 @@ module PuppetMetadata
|
|
|
21
21
|
'CentOS' => ['8'],
|
|
22
22
|
}.freeze
|
|
23
23
|
class << self
|
|
24
|
+
# modifies the operating system name to suit beaker-hostgenerator
|
|
25
|
+
# @param [String] os
|
|
26
|
+
# @return [String] the modified OS name
|
|
27
|
+
def adjusted_os(os)
|
|
28
|
+
case os
|
|
29
|
+
when 'OracleLinux'
|
|
30
|
+
'oracle'
|
|
31
|
+
else
|
|
32
|
+
os.downcase
|
|
33
|
+
end
|
|
34
|
+
end
|
|
35
|
+
|
|
24
36
|
# Convert an Operating System name with a release to a Beaker setfile
|
|
25
37
|
#
|
|
26
38
|
# @param [String] os
|
|
@@ -46,7 +58,9 @@ module PuppetMetadata
|
|
|
46
58
|
def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false, domain: nil, puppet_version: nil)
|
|
47
59
|
return unless os_supported?(os)
|
|
48
60
|
|
|
49
|
-
|
|
61
|
+
aos = adjusted_os(os)
|
|
62
|
+
|
|
63
|
+
name = "#{aos}#{release.tr('.', '')}-64"
|
|
50
64
|
hostname = (puppet_version.nil? && puppet_version != 'none') ? name : "#{name}-#{puppet_version}"
|
|
51
65
|
domain ||= 'example.com' if use_fqdn
|
|
52
66
|
|
|
@@ -71,7 +85,7 @@ module PuppetMetadata
|
|
|
71
85
|
# Return whether a Beaker setfile can be generated for the given OS
|
|
72
86
|
# @param [String] os The operating system
|
|
73
87
|
def os_supported?(os)
|
|
74
|
-
%w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux].include?(os)
|
|
88
|
+
%w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux OracleLinux].include?(os)
|
|
75
89
|
end
|
|
76
90
|
|
|
77
91
|
private
|
|
@@ -45,6 +45,12 @@ module PuppetMetadata
|
|
|
45
45
|
'2.2' => '2003-06-30',
|
|
46
46
|
'2.1' => '2000-09-30',
|
|
47
47
|
},
|
|
48
|
+
# https://endoflife.date/oraclelinux
|
|
49
|
+
'OracleLinux' => {
|
|
50
|
+
'9' => '2032-06-30',
|
|
51
|
+
'8' => '2029-07-01',
|
|
52
|
+
'7' => '2024-07-01',
|
|
53
|
+
},
|
|
48
54
|
# https://endoflife.software/operating-systems/linux/fedora
|
|
49
55
|
'Fedora' => {
|
|
50
56
|
'32' => nil,
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: puppet_metadata
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.
|
|
4
|
+
version: 3.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vox Pupuli
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2023-
|
|
12
|
+
date: 2023-08-11 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: metadata-json-lint
|