foreman_maintain 1.0.9 → 1.0.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: 6f3b029d12907c373c22b065792200ff3c8087051d1d3573da149124c4a7b9d4
|
4
|
+
data.tar.gz: d70220606c7f0c5af7ea9115b16d5f9cb248765f2420f01f72482031495dc980
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 657e8536192d1fa4ac0a9ec16161a1ce128e9747a827ea4d87869049f35d1cae8683a691efd3ab629b82fdc3ca1251153768cf208444daa412780061f0fb0862
|
7
|
+
data.tar.gz: '039b4a5cb9389ca78a2497f05e14bfb2ee9e7f1f4298025ee254cbbc02f4317f4bdfe9a5e71722e6bfb75e4b6679d3473fe7d080d9f55d811fe1d554549b2da1'
|
@@ -64,7 +64,9 @@ class Features::Installer < ForemanMaintain::Feature
|
|
64
64
|
def config_files
|
65
65
|
Dir.glob(File.join(config_directory, '**/*')) +
|
66
66
|
[
|
67
|
-
'/usr/local/bin/validate_postgresql_connection.sh'
|
67
|
+
'/usr/local/bin/validate_postgresql_connection.sh',
|
68
|
+
'/opt/puppetlabs/puppet/cache/foreman_cache_data',
|
69
|
+
'/opt/puppetlabs/puppet/cache/pulpcore_cache_data'
|
68
70
|
]
|
69
71
|
end
|
70
72
|
|
@@ -11,8 +11,6 @@ class Features::PuppetServer < ForemanMaintain::Feature
|
|
11
11
|
[
|
12
12
|
'/etc/puppet',
|
13
13
|
'/etc/puppetlabs',
|
14
|
-
'/opt/puppetlabs/puppet/cache/foreman_cache_data',
|
15
|
-
'/var/lib/puppet/foreman_cache_data',
|
16
14
|
'/opt/puppetlabs/puppet/ssl/',
|
17
15
|
'/var/lib/puppet/ssl',
|
18
16
|
'/var/lib/puppet',
|
@@ -1,5 +1,6 @@
|
|
1
1
|
module ForemanMaintain::Scenarios
|
2
2
|
class SelfUpgradeBase < ForemanMaintain::Scenario
|
3
|
+
include ForemanMaintain::Concerns::Downstream
|
3
4
|
def enabled_system_repos_id
|
4
5
|
repository_manager.enabled_repos.keys
|
5
6
|
end
|
@@ -67,7 +68,10 @@ module ForemanMaintain::Scenarios
|
|
67
68
|
|
68
69
|
def repos_ids_to_reenable
|
69
70
|
repos_ids_to_reenable = stored_enabled_repos_ids - all_maintenance_repos
|
70
|
-
|
71
|
+
if use_rhsm?
|
72
|
+
repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
|
73
|
+
end
|
74
|
+
repos_ids_to_reenable
|
71
75
|
end
|
72
76
|
|
73
77
|
def use_rhsm?
|
@@ -79,6 +83,10 @@ module ForemanMaintain::Scenarios
|
|
79
83
|
|
80
84
|
true
|
81
85
|
end
|
86
|
+
|
87
|
+
def req_repos_to_update_pkgs
|
88
|
+
main_rh_repos + [maintenance_repo_id(target_version)]
|
89
|
+
end
|
82
90
|
end
|
83
91
|
|
84
92
|
class SelfUpgrade < SelfUpgradeBase
|
@@ -94,9 +102,10 @@ module ForemanMaintain::Scenarios
|
|
94
102
|
pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
|
95
103
|
add_step(Procedures::Repositories::BackupEnabledRepos.new)
|
96
104
|
disable_repos
|
97
|
-
add_step(Procedures::Repositories::Enable.new(repos:
|
105
|
+
add_step(Procedures::Repositories::Enable.new(repos: req_repos_to_update_pkgs,
|
98
106
|
use_rhsm: use_rhsm?))
|
99
107
|
add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
|
108
|
+
disable_repos('*')
|
100
109
|
enable_repos(repos_ids_to_reenable)
|
101
110
|
end
|
102
111
|
end
|
@@ -113,6 +122,7 @@ module ForemanMaintain::Scenarios
|
|
113
122
|
|
114
123
|
def compose
|
115
124
|
if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
|
125
|
+
disable_repos('*')
|
116
126
|
enable_repos(repos_ids_to_reenable)
|
117
127
|
end
|
118
128
|
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.0.
|
4
|
+
version: 1.0.10
|
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: 2022-05-
|
11
|
+
date: 2022-05-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: clamp
|