foreman_maintain 1.4.4 → 1.5.0

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/definitions/scenarios/{upgrade_to_capsule_6_15_z.rb → upgrade_to_capsule_6_16.rb} +10 -10
  3. data/definitions/scenarios/{upgrade_to_capsule_6_15.rb → upgrade_to_capsule_6_16_z.rb} +11 -11
  4. data/definitions/scenarios/{upgrade_to_satellite_6_15_z.rb → upgrade_to_satellite_6_16.rb} +11 -10
  5. data/definitions/scenarios/{upgrade_to_satellite_6_15.rb → upgrade_to_satellite_6_16_z.rb} +11 -12
  6. data/lib/foreman_maintain/version.rb +1 -1
  7. metadata +6 -7
  8. data/definitions/checks/katello_agent.rb +0 -39
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b1c667552795ef78c81447baaad773108b77669a36ee84858e710634d4d51690
4
- data.tar.gz: b45c8ff19cd462003a01b82114021c81ebc1891fbdb00e42b2fc48f07aeed2a1
3
+ metadata.gz: 100d751c774b8d059da095d52e16b0f550d07cfc452dde7416c02268dceceea0
4
+ data.tar.gz: 4d321b112aed2dd01a6f4175a66ce0f70a58b40a66da9b476bda3eb12a4697ca
5
5
  SHA512:
6
- metadata.gz: eeb24ce08dd3d3cf2dfddb3116719bc11365ab902111a8bc62a887bb3054c74ae062fa6028f8fdddce2b2153359cb8f4a290e4e300fd295e3f1ba87f0c9b22b5
7
- data.tar.gz: 98bd38fda86ed2cf459f6bb3a404f13b9f078650301ef89e4e6872ca32e234313f4f8d12bf819bb8b8af57710226d5528cc0fa59ec0b9593fc56a18c8a1245ac
6
+ metadata.gz: 3b1760b02ab02ad1918de24f7aef1f761cf24aefb76ab0191d360cd14b430255926fff5971b349f7f18cd0736664add545af2a3a0a04b73e3e6e71a7b75952ae
7
+ data.tar.gz: 806f8f9c132c662b9e5a812520589a59c4986783b1962389705d5743f901bfd157c5fb9bf4c16455c80678d3033648d6f0ee36f41045bbbae59e097d62381624
data/definitions/scenarios/{upgrade_to_capsule_6_15_z.rb → upgrade_to_capsule_6_16.rb} RENAMED
@@ -1,4 +1,4 @@
1
- module Scenarios::Capsule_6_15_z
1
+ module Scenarios::Capsule_6_16
2
2
  class Abstract < ForemanMaintain::Scenario
3
3
  def self.upgrade_metadata(&block)
4
4
  metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_6_15_z
6
6
  confine do
7
7
  feature(:capsule) &&
8
8
  (feature(:capsule).current_minor_version == '6.15' || \
9
- ForemanMaintain.upgrade_in_progress == '6.15.z')
9
+ ForemanMaintain.upgrade_in_progress == '6.16')
10
10
  end
11
11
  instance_eval(&block)
12
12
  end
13
13
  end
14
14
 
15
15
  def target_version
16
- '6.15.z'
16
+ '6.16'
17
17
  end
18
18
  end
19
19
 
20
20
  class PreUpgradeCheck < Abstract
21
21
  upgrade_metadata do
22
- description 'Checks before upgrading to Capsule 6.15.z'
22
+ description 'Checks before upgrading to Capsule 6.16'
23
23
  tags :pre_upgrade_checks
24
24
  run_strategy :fail_slow
25
25
  end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_6_15_z
27
27
  def compose
28
28
  add_steps(find_checks(:default))
29
29
  add_steps(find_checks(:pre_upgrade))
30
- add_step(Checks::Repositories::Validate.new(:version => '6.15'))
30
+ add_step(Checks::Repositories::Validate.new(:version => '6.16'))
31
31
  end
32
32
  end
33
33
 
34
34
  class PreMigrations < Abstract
35
35
  upgrade_metadata do
36
- description 'Procedures before migrating to Capsule 6.15.z'
36
+ description 'Procedures before migrating to Capsule 6.16'
37
37
  tags :pre_migrations
38
38
  end
39
39
 
@@ -44,7 +44,7 @@ module Scenarios::Capsule_6_15_z
44
44
 
45
45
  class Migrations < Abstract
46
46
  upgrade_metadata do
47
- description 'Migration scripts to Capsule 6.15.z'
47
+ description 'Migration scripts to Capsule 6.16'
48
48
  tags :migrations
49
49
  end
50
50
 
@@ -53,7 +53,7 @@ module Scenarios::Capsule_6_15_z
53
53
  end
54
54
 
55
55
  def compose
56
- add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
56
+ add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
57
57
  modules_to_enable = ["satellite-capsule:#{el_short_name}"]
58
58
  add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
59
  add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -66,7 +66,7 @@ module Scenarios::Capsule_6_15_z
66
66
 
67
67
  class PostMigrations < Abstract
68
68
  upgrade_metadata do
69
- description 'Procedures after migrating to Capsule 6.15.z'
69
+ description 'Procedures after migrating to Capsule 6.16'
70
70
  tags :post_migrations
71
71
  end
72
72
 
@@ -79,7 +79,7 @@ module Scenarios::Capsule_6_15_z
79
79
 
80
80
  class PostUpgradeChecks < Abstract
81
81
  upgrade_metadata do
82
- description 'Checks after upgrading to Capsule 6.15.z'
82
+ description 'Checks after upgrading to Capsule 6.16'
83
83
  tags :post_upgrade_checks
84
84
  run_strategy :fail_slow
85
85
  end
data/definitions/scenarios/{upgrade_to_capsule_6_15.rb → upgrade_to_capsule_6_16_z.rb} RENAMED
@@ -1,25 +1,25 @@
1
- module Scenarios::Capsule_6_15
1
+ module Scenarios::Capsule_6_16_z
2
2
  class Abstract < ForemanMaintain::Scenario
3
3
  def self.upgrade_metadata(&block)
4
4
  metadata do
5
5
  tags :upgrade_scenario
6
6
  confine do
7
7
  feature(:capsule) &&
8
- (feature(:capsule).current_minor_version == '6.14' || \
9
- ForemanMaintain.upgrade_in_progress == '6.15')
8
+ (feature(:capsule).current_minor_version == '6.16' || \
9
+ ForemanMaintain.upgrade_in_progress == '6.16.z')
10
10
  end
11
11
  instance_eval(&block)
12
12
  end
13
13
  end
14
14
 
15
15
  def target_version
16
- '6.15'
16
+ '6.16.z'
17
17
  end
18
18
  end
19
19
 
20
20
  class PreUpgradeCheck < Abstract
21
21
  upgrade_metadata do
22
- description 'Checks before upgrading to Capsule 6.15'
22
+ description 'Checks before upgrading to Capsule 6.16.z'
23
23
  tags :pre_upgrade_checks
24
24
  run_strategy :fail_slow
25
25
  end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_6_15
27
27
  def compose
28
28
  add_steps(find_checks(:default))
29
29
  add_steps(find_checks(:pre_upgrade))
30
- add_step(Checks::Repositories::Validate.new(:version => '6.15'))
30
+ add_step(Checks::Repositories::Validate.new(:version => '6.16'))
31
31
  end
32
32
  end
33
33
 
34
34
  class PreMigrations < Abstract
35
35
  upgrade_metadata do
36
- description 'Procedures before migrating to Capsule 6.15'
36
+ description 'Procedures before migrating to Capsule 6.16.z'
37
37
  tags :pre_migrations
38
38
  end
39
39
 
@@ -44,7 +44,7 @@ module Scenarios::Capsule_6_15
44
44
 
45
45
  class Migrations < Abstract
46
46
  upgrade_metadata do
47
- description 'Migration scripts to Capsule 6.15'
47
+ description 'Migration scripts to Capsule 6.16.z'
48
48
  tags :migrations
49
49
  end
50
50
 
@@ -53,7 +53,7 @@ module Scenarios::Capsule_6_15
53
53
  end
54
54
 
55
55
  def compose
56
- add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
56
+ add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
57
57
  modules_to_enable = ["satellite-capsule:#{el_short_name}"]
58
58
  add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
59
  add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -66,7 +66,7 @@ module Scenarios::Capsule_6_15
66
66
 
67
67
  class PostMigrations < Abstract
68
68
  upgrade_metadata do
69
- description 'Procedures after migrating to Capsule 6.15'
69
+ description 'Procedures after migrating to Capsule 6.16.z'
70
70
  tags :post_migrations
71
71
  end
72
72
 
@@ -79,7 +79,7 @@ module Scenarios::Capsule_6_15
79
79
 
80
80
  class PostUpgradeChecks < Abstract
81
81
  upgrade_metadata do
82
- description 'Checks after upgrading to Capsule 6.15'
82
+ description 'Checks after upgrading to Capsule 6.16.z'
83
83
  tags :post_upgrade_checks
84
84
  run_strategy :fail_slow
85
85
  end
data/definitions/scenarios/{upgrade_to_satellite_6_15_z.rb → upgrade_to_satellite_6_16.rb} RENAMED
@@ -1,4 +1,4 @@
1
- module Scenarios::Satellite_6_15_z
1
+ module Scenarios::Satellite_6_16
2
2
  class Abstract < ForemanMaintain::Scenario
3
3
  def self.upgrade_metadata(&block)
4
4
  metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_6_15_z
6
6
  confine do
7
7
  feature(:satellite) &&
8
8
  (feature(:satellite).current_minor_version == '6.15' || \
9
- ForemanMaintain.upgrade_in_progress == '6.15.z')
9
+ ForemanMaintain.upgrade_in_progress == '6.16')
10
10
  end
11
11
  instance_eval(&block)
12
12
  end
13
13
  end
14
14
 
15
15
  def target_version
16
- '6.15.z'
16
+ '6.16'
17
17
  end
18
18
  end
19
19
 
20
20
  class PreUpgradeCheck < Abstract
21
21
  upgrade_metadata do
22
- description 'Checks before upgrading to Satellite 6.15.z'
22
+ description 'Checks before upgrading to Satellite 6.16'
23
23
  tags :pre_upgrade_checks
24
24
  run_strategy :fail_slow
25
25
  end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_6_15_z
27
27
  def compose
28
28
  add_steps(find_checks(:default))
29
29
  add_steps(find_checks(:pre_upgrade))
30
- add_step(Checks::Repositories::Validate.new(:version => '6.15'))
30
+ add_step(Checks::Repositories::Validate.new(:version => '6.16'))
31
31
  end
32
32
  end
33
33
 
34
34
  class PreMigrations < Abstract
35
35
  upgrade_metadata do
36
- description 'Procedures before migrating to Satellite 6.15.z'
36
+ description 'Procedures before migrating to Satellite 6.16'
37
37
  tags :pre_migrations
38
38
  end
39
39
 
@@ -44,8 +44,9 @@ module Scenarios::Satellite_6_15_z
44
44
 
45
45
  class Migrations < Abstract
46
46
  upgrade_metadata do
47
- description 'Migration scripts to Satellite 6.15.z'
47
+ description 'Migration scripts to Satellite 6.16'
48
48
  tags :migrations
49
+ run_strategy :fail_fast
49
50
  end
50
51
 
51
52
  def set_context_mapping
@@ -53,7 +54,7 @@ module Scenarios::Satellite_6_15_z
53
54
  end
54
55
 
55
56
  def compose
56
- add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
57
+ add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
57
58
  modules_to_enable = ["satellite:#{el_short_name}"]
58
59
  add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
60
  add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -67,7 +68,7 @@ module Scenarios::Satellite_6_15_z
67
68
 
68
69
  class PostMigrations < Abstract
69
70
  upgrade_metadata do
70
- description 'Procedures after migrating to Satellite 6.15.z'
71
+ description 'Procedures after migrating to Satellite 6.16'
71
72
  tags :post_migrations
72
73
  end
73
74
 
@@ -80,7 +81,7 @@ module Scenarios::Satellite_6_15_z
80
81
 
81
82
  class PostUpgradeChecks < Abstract
82
83
  upgrade_metadata do
83
- description 'Checks after upgrading to Satellite 6.15.z'
84
+ description 'Checks after upgrading to Satellite 6.16'
84
85
  tags :post_upgrade_checks
85
86
  run_strategy :fail_slow
86
87
  end
data/definitions/scenarios/{upgrade_to_satellite_6_15.rb → upgrade_to_satellite_6_16_z.rb} RENAMED
@@ -1,25 +1,25 @@
1
- module Scenarios::Satellite_6_15
1
+ module Scenarios::Satellite_6_16_z
2
2
  class Abstract < ForemanMaintain::Scenario
3
3
  def self.upgrade_metadata(&block)
4
4
  metadata do
5
5
  tags :upgrade_scenario
6
6
  confine do
7
7
  feature(:satellite) &&
8
- (feature(:satellite).current_minor_version == '6.14' || \
9
- ForemanMaintain.upgrade_in_progress == '6.15')
8
+ (feature(:satellite).current_minor_version == '6.16' || \
9
+ ForemanMaintain.upgrade_in_progress == '6.16.z')
10
10
  end
11
11
  instance_eval(&block)
12
12
  end
13
13
  end
14
14
 
15
15
  def target_version
16
- '6.15'
16
+ '6.16.z'
17
17
  end
18
18
  end
19
19
 
20
20
  class PreUpgradeCheck < Abstract
21
21
  upgrade_metadata do
22
- description 'Checks before upgrading to Satellite 6.15'
22
+ description 'Checks before upgrading to Satellite 6.16.z'
23
23
  tags :pre_upgrade_checks
24
24
  run_strategy :fail_slow
25
25
  end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_6_15
27
27
  def compose
28
28
  add_steps(find_checks(:default))
29
29
  add_steps(find_checks(:pre_upgrade))
30
- add_step(Checks::Repositories::Validate.new(:version => '6.15'))
30
+ add_step(Checks::Repositories::Validate.new(:version => '6.16'))
31
31
  end
32
32
  end
33
33
 
34
34
  class PreMigrations < Abstract
35
35
  upgrade_metadata do
36
- description 'Procedures before migrating to Satellite 6.15'
36
+ description 'Procedures before migrating to Satellite 6.16.z'
37
37
  tags :pre_migrations
38
38
  end
39
39
 
@@ -44,9 +44,8 @@ module Scenarios::Satellite_6_15
44
44
 
45
45
  class Migrations < Abstract
46
46
  upgrade_metadata do
47
- description 'Migration scripts to Satellite 6.15'
47
+ description 'Migration scripts to Satellite 6.16.z'
48
48
  tags :migrations
49
- run_strategy :fail_fast
50
49
  end
51
50
 
52
51
  def set_context_mapping
@@ -54,7 +53,7 @@ module Scenarios::Satellite_6_15
54
53
  end
55
54
 
56
55
  def compose
57
- add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
56
+ add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
58
57
  modules_to_enable = ["satellite:#{el_short_name}"]
59
58
  add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
60
59
  add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -68,7 +67,7 @@ module Scenarios::Satellite_6_15
68
67
 
69
68
  class PostMigrations < Abstract
70
69
  upgrade_metadata do
71
- description 'Procedures after migrating to Satellite 6.15'
70
+ description 'Procedures after migrating to Satellite 6.16.z'
72
71
  tags :post_migrations
73
72
  end
74
73
 
@@ -81,7 +80,7 @@ module Scenarios::Satellite_6_15
81
80
 
82
81
  class PostUpgradeChecks < Abstract
83
82
  upgrade_metadata do
84
- description 'Checks after upgrading to Satellite 6.15'
83
+ description 'Checks after upgrading to Satellite 6.16.z'
85
84
  tags :post_upgrade_checks
86
85
  run_strategy :fail_slow
87
86
  end
data/lib/foreman_maintain/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '1.4.4'.freeze
2
+ VERSION = '1.5.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_maintain
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.4
4
+ version: 1.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-12-14 00:00:00.000000000 Z
11
+ date: 2024-01-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: clamp
@@ -181,7 +181,6 @@ files:
181
181
  - definitions/checks/foreman_tasks/invalid/check_planning_state.rb
182
182
  - definitions/checks/foreman_tasks/not_paused.rb
183
183
  - definitions/checks/foreman_tasks/not_running.rb
184
- - definitions/checks/katello_agent.rb
185
184
  - definitions/checks/maintenance_mode/check_consistency.rb
186
185
  - definitions/checks/non_rh_packages.rb
187
186
  - definitions/checks/package_manager/dnf/validate_dnf_config.rb
@@ -327,12 +326,12 @@ files:
327
326
  - definitions/scenarios/restore.rb
328
327
  - definitions/scenarios/self_upgrade.rb
329
328
  - definitions/scenarios/services.rb
330
- - definitions/scenarios/upgrade_to_capsule_6_15.rb
331
- - definitions/scenarios/upgrade_to_capsule_6_15_z.rb
329
+ - definitions/scenarios/upgrade_to_capsule_6_16.rb
330
+ - definitions/scenarios/upgrade_to_capsule_6_16_z.rb
332
331
  - definitions/scenarios/upgrade_to_foreman_nightly.rb
333
332
  - definitions/scenarios/upgrade_to_katello_nightly.rb
334
- - definitions/scenarios/upgrade_to_satellite_6_15.rb
335
- - definitions/scenarios/upgrade_to_satellite_6_15_z.rb
333
+ - definitions/scenarios/upgrade_to_satellite_6_16.rb
334
+ - definitions/scenarios/upgrade_to_satellite_6_16_z.rb
336
335
  - extras/foreman-maintain.sh
337
336
  - extras/foreman_protector/dnf/foreman-protector.py
338
337
  - extras/foreman_protector/foreman-protector.conf
data/definitions/checks/katello_agent.rb DELETED
@@ -1,39 +0,0 @@
1
- class Checks::CheckKatelloAgentEnabled < ForemanMaintain::Check
2
- metadata do
3
- label :check_katello_agent_enabled
4
- description 'Check whether the katello-agent feature is enabled before upgrading'
5
- tags :pre_upgrade
6
-
7
- confine do
8
- !feature(:capsule)
9
- end
10
- end
11
-
12
- def run
13
- instance_name = feature(:instance).downstream ? "Satellite" : "Katello"
14
- instance_version = feature(:instance).downstream ? "6.15" : "4.10"
15
- installer_command = feature(:instance).downstream ? "satellite-installer" : "foreman-installer"
16
- maintain_command = feature(:instance).downstream ? "satellite-maintain" : "foreman-maintain"
17
-
18
- assert(
19
- !katello_agent_enabled?,
20
- "The katello-agent feature is enabled on this system. As of #{instance_name}"\
21
- " #{instance_version}, katello-agent is removed and will no longer function."\
22
- " Before proceeding with the upgrade, you should ensure that you have deployed"\
23
- " and configured an alternative tool for remote package management and patching"\
24
- " for content hosts, such as Remote Execution (REX) with pull-based transport."\
25
- " See the Managing Hosts guide in the #{instance_name} documentation for more info."\
26
- " Disable katello-agent with the command"\
27
- " `#{installer_command} --foreman-proxy-content-enable-katello-agent false`"\
28
- " before proceeding with the upgrade. Alternatively, you may skip this check and proceed by"\
29
- " running #{maintain_command} again with the `--whitelist` option, which will automatically"\
30
- " uninstall katello-agent."
31
- )
32
- end
33
-
34
- private
35
-
36
- def katello_agent_enabled?
37
- feature(:installer).answers['foreman_proxy_content']['enable_katello_agent']
38
- end
39
- end