foreman_maintain 1.13.3 → 1.13.4

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: 4082c169b1eb743083f6ecb900baede1873b61864734ed3257a3a7f0c95836fc
4
- data.tar.gz: f6232f0d970880abbd3ede420d46afef364c1026b75a4503d06e25265a3b2c5f
3
+ metadata.gz: 47dd6828358b6e60006dc15848353d14a6ffd6fd5bcfc62bf6620e3a687422ed
4
+ data.tar.gz: ceda8e721cb93453662c226c820cbe0931387673e4d03d78e16e64f2d52d310c
5
5
  SHA512:
6
- metadata.gz: 5c395bf50959d58e4a31d79a9238986f78dad6d24ad433c11a66f0630921b3646a292334331ae27a8765bc048371dd82bc33bb6ca94c8ea27aad2190a28476cd
7
- data.tar.gz: 77c15f1caec28991de6b3123c201ae5c5235f26a397657f6e133dc35f84e3a2c2b9cad6557b4bbc8b458079feb56b857ba4daa49bf9db5c0b4dcece2bd58dc7a
6
+ metadata.gz: dc4bb5fadb0df51bf32d328b7e4bd7a8dd17c1d78898b2e789ee2c69e1fce5a73e3b8e0335e03c3090fc24e8525435933d0ffd79f00c0fefa1bfa720b2641873
7
+ data.tar.gz: eeafeff1413924cd397dc45e8355c1c9785e73e2ae9970e897a488693f433052ac635c18e80a9366328a2842329686718144c301066c46c9ff599854a4eb7ec4
@@ -3,8 +3,7 @@ class Features::Iop < ForemanMaintain::Feature
3
3
  label :iop
4
4
 
5
5
  confine do
6
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
7
- File.exist?('/etc/containers/systemd/iop-core.network')
6
+ feature(:installer)&.answers&.dig('iop', 'ensure') == 'present'
8
7
  end
9
8
  end
10
9
 
@@ -5,8 +5,7 @@ class Features::IopAdvisorDatabase < ForemanMaintain::Feature
5
5
  label :iop_advisor_database
6
6
 
7
7
  confine do
8
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
9
- File.exist?('/etc/containers/systemd/iop-core.network')
8
+ feature(:iop)
10
9
  end
11
10
  end
12
11
 
@@ -5,8 +5,7 @@ class Features::IopInventoryDatabase < ForemanMaintain::Feature
5
5
  label :iop_inventory_database
6
6
 
7
7
  confine do
8
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
9
- File.exist?('/etc/containers/systemd/iop-core.network')
8
+ feature(:iop)
10
9
  end
11
10
  end
12
11
 
@@ -5,8 +5,7 @@ class Features::IopRemediationsDatabase < ForemanMaintain::Feature
5
5
  label :iop_remediations_database
6
6
 
7
7
  confine do
8
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
9
- File.exist?('/etc/containers/systemd/iop-core.network')
8
+ feature(:iop)
10
9
  end
11
10
  end
12
11
 
@@ -5,8 +5,7 @@ class Features::IopVmaasDatabase < ForemanMaintain::Feature
5
5
  label :iop_vmaas_database
6
6
 
7
7
  confine do
8
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
9
- File.exist?('/etc/containers/systemd/iop-core.network')
8
+ feature(:iop)
10
9
  end
11
10
  end
12
11
 
@@ -5,8 +5,7 @@ class Features::IopVulnerabilityDatabase < ForemanMaintain::Feature
5
5
  label :iop_vulnerability_database
6
6
 
7
7
  confine do
8
- File.exist?('/etc/containers/networks/iop-core-network.json') ||
9
- File.exist?('/etc/containers/systemd/iop-core.network')
8
+ feature(:iop)
10
9
  end
11
10
  end
12
11
 
@@ -11,7 +11,7 @@ module Reports
11
11
 
12
12
  def iop_remediations_enabled
13
13
  if @iop_enabled.nil?
14
- @iop_enabled = feature(:installer)&.answers&.fetch('iop', false) != false
14
+ @iop_enabled = feature(:installer)&.answers&.dig('iop', 'ensure') == 'present'
15
15
  end
16
16
  @iop_enabled
17
17
  end
@@ -7,7 +7,8 @@ module ForemanMaintain
7
7
  scenario = run_scenario(Scenarios::Report::Generate.new({}, [:reports])).first
8
8
 
9
9
  # description can be used too
10
- report_data = scenario.steps.map(&:data).compact.reduce(&:merge).transform_keys(&:to_s)
10
+ report_data = scenario.steps.map(&:data).compact.reduce(&:merge).
11
+ transform_keys(&:to_s).sort.to_h
11
12
  report_data['version'] = 2
12
13
  report_data
13
14
  end
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '1.13.3'.freeze
2
+ VERSION = '1.13.4'.freeze
3
3
  end
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.3
4
+ version: 1.13.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas