foreman_maintain 1.13.8 → 1.13.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 894b874616603368e47a0594cebae575b6c8e3d9a586d7dc2e41a68717137909
|
|
4
|
+
data.tar.gz: 782ec80b9c3cfd8132c882951c8337155f6f36eabf1d6aefd2e89ea7d18f5874
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e973a0c353001584a755d37053a24d4ee41d3fd8749191072e47aeecc1d391bec04ccf6204e130569fdbeebe5b05388f3927f65cc526a4f922434d8eec96d428
|
|
7
|
+
data.tar.gz: 62c81b8843d116293ae9f90a892eb166cd5fc71b47d454fd0029be3eec791ca0d77b47147e706974f04225c9777676cb1165e48539b779f16e19dc2f617314ba
|
|
@@ -3,7 +3,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
|
|
|
3
3
|
label :puppet_server
|
|
4
4
|
|
|
5
5
|
confine do
|
|
6
|
-
find_package('puppet-server') ||
|
|
6
|
+
find_package('puppet-server') ||
|
|
7
|
+
find_package('openvox-server') ||
|
|
8
|
+
find_package('puppetserver') ||
|
|
9
|
+
find_package('puppet')
|
|
7
10
|
end
|
|
8
11
|
end
|
|
9
12
|
|
|
@@ -23,7 +26,13 @@ class Features::PuppetServer < ForemanMaintain::Feature
|
|
|
23
26
|
# We only check puppetserver and not puppet-server, as puppet-server
|
|
24
27
|
# is a part of httpd and relies on httpd service to restart, therefore
|
|
25
28
|
# not requiring a separate service to restart
|
|
26
|
-
|
|
29
|
+
return [system_service('puppetserver', 30)] if find_package('puppetserver') ||
|
|
30
|
+
find_package('openvox-server')
|
|
31
|
+
[]
|
|
32
|
+
end
|
|
33
|
+
|
|
34
|
+
def openvox?
|
|
35
|
+
find_package('openvox-server')
|
|
27
36
|
end
|
|
28
37
|
|
|
29
38
|
def find_empty_cacert_request_files
|
|
@@ -12,6 +12,7 @@ module Procedures::Restore
|
|
|
12
12
|
backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
|
|
13
13
|
required_packages = []
|
|
14
14
|
required_packages << 'puppetserver' if backup.with_puppetserver?
|
|
15
|
+
required_packages << 'openvox-server' if backup.with_openvoxserver?
|
|
15
16
|
if required_packages.any?
|
|
16
17
|
with_spinner('Installing required packages') do
|
|
17
18
|
ForemanMaintain.package_manager.install(required_packages, assumeyes: true)
|
|
@@ -179,6 +179,10 @@ module ForemanMaintain
|
|
|
179
179
|
installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
|
|
180
180
|
end
|
|
181
181
|
|
|
182
|
+
def with_openvoxserver?
|
|
183
|
+
installed_rpms.any? { |rpm| rpm.start_with?('openvox-server-') }
|
|
184
|
+
end
|
|
185
|
+
|
|
182
186
|
def source_os_version
|
|
183
187
|
metadata.fetch('os_version', 'unknown')
|
|
184
188
|
end
|
|
@@ -3,7 +3,7 @@ module ForemanMaintain::Utils
|
|
|
3
3
|
class << self
|
|
4
4
|
def condense_report(data)
|
|
5
5
|
result = {}
|
|
6
|
-
%w[
|
|
6
|
+
%w[iop_remediations_count rhel_ai_workload_host_count].each do |key|
|
|
7
7
|
result[key] = data[key] || 0
|
|
8
8
|
end
|
|
9
9
|
result.merge!(aggregate_host_count(data))
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_maintain
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.13.
|
|
4
|
+
version: 1.13.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Nečas
|
|
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
490
490
|
- !ruby/object:Gem::Version
|
|
491
491
|
version: '0'
|
|
492
492
|
requirements: []
|
|
493
|
-
rubygems_version: 4.0.
|
|
493
|
+
rubygems_version: 4.0.16
|
|
494
494
|
specification_version: 4
|
|
495
495
|
summary: Foreman maintenance tool belt
|
|
496
496
|
test_files: []
|