foreman_maintain 1.0.16 → 1.0.18
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: c1567588355faeafabafe49dfee31db43eeb6c652b61d27ad6041eddb1b6a993
|
|
4
|
+
data.tar.gz: '0722639fa591f720708cb5bed060416e43a5d5e0312b1dc49d31db2f08a1c061'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c95a6a85ac2ae259a6d7c4f51a86c2b96c53441c9cb6e0762154c04d3122475963615749669b96bf8766136903b96de5da4f33051a23dc9eb6c6db0e2dd31e7a
|
|
7
|
+
data.tar.gz: 8c92687da1590f99d477a074837ed15745db6b505aac339f9621d1e91cffbbdaa783e091a85d3441935327be7714af8a8289c30b9779549d736e736ff204c816
|
|
@@ -75,7 +75,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
|
|
|
75
75
|
# rubocop:enable Metrics/MethodLength
|
|
76
76
|
|
|
77
77
|
def extend_with_db_options
|
|
78
|
-
db_options = { '-d' =>
|
|
78
|
+
db_options = { '-d' => configuration['database'] }
|
|
79
79
|
if check_option_using_cpdb_help('dbhost')
|
|
80
80
|
db_options['--dbhost'] = configuration['host']
|
|
81
81
|
db_options['--dbport'] = configuration['port']
|
|
@@ -83,15 +83,6 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
|
|
|
83
83
|
db_options
|
|
84
84
|
end
|
|
85
85
|
|
|
86
|
-
def construct_database_string
|
|
87
|
-
db_str = configuration['database']
|
|
88
|
-
extra_opts = []
|
|
89
|
-
extra_opts << "ssl=#{configuration['ssl']}" if configuration['ssl']
|
|
90
|
-
extra_opts << "sslfactory=#{configuration['sslfactory']}" if configuration['sslfactory']
|
|
91
|
-
db_str += "?#{extra_opts.join('&')}" unless extra_opts.empty?
|
|
92
|
-
db_str
|
|
93
|
-
end
|
|
94
|
-
|
|
95
86
|
def fetch_extra_param(url, key_name)
|
|
96
87
|
query_string = url.split('?')[1]
|
|
97
88
|
return nil unless query_string
|
|
@@ -2,12 +2,11 @@ module ForemanMaintain::Scenarios
|
|
|
2
2
|
class SelfUpgradeBase < ForemanMaintain::Scenario
|
|
3
3
|
include ForemanMaintain::Concerns::Downstream
|
|
4
4
|
def target_version
|
|
5
|
-
|
|
6
|
-
@target_version ||= current_full_version.bump
|
|
5
|
+
@target_version ||= Gem::Version.new(current_version).bump.to_s
|
|
7
6
|
end
|
|
8
7
|
|
|
9
8
|
def current_version
|
|
10
|
-
feature(:instance).downstream.
|
|
9
|
+
feature(:instance).downstream.current_version.to_s[/^\d+\.\d+\.\d+/]
|
|
11
10
|
end
|
|
12
11
|
|
|
13
12
|
def maintenance_repo_label
|
|
@@ -66,7 +66,8 @@ module ForemanMaintain
|
|
|
66
66
|
server_version_full = "#{server_version.major}.#{server_version.minor}"
|
|
67
67
|
rh_repos.concat(product_specific_repos(server_version_full))
|
|
68
68
|
if server_version > version('6.3')
|
|
69
|
-
|
|
69
|
+
ansible_repo = ansible_repo(server_version)
|
|
70
|
+
rh_repos << ansible_repo if ansible_repo
|
|
70
71
|
end
|
|
71
72
|
|
|
72
73
|
rh_repos
|
|
@@ -83,8 +84,6 @@ module ForemanMaintain
|
|
|
83
84
|
|
|
84
85
|
if el7?
|
|
85
86
|
"rhel-#{el_major_version}-server-ansible-#{ansible_version}-rpms"
|
|
86
|
-
else
|
|
87
|
-
"ansible-#{ansible_version}-for-rhel-#{el_major_version}-x86_64-rpms"
|
|
88
87
|
end
|
|
89
88
|
end
|
|
90
89
|
|
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.18
|
|
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-
|
|
11
|
+
date: 2022-10-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: clamp
|
|
@@ -108,6 +108,20 @@ dependencies:
|
|
|
108
108
|
- - '='
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: 0.50.0
|
|
111
|
+
- !ruby/object:Gem::Dependency
|
|
112
|
+
name: minitest-stub-const
|
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
|
114
|
+
requirements:
|
|
115
|
+
- - ">="
|
|
116
|
+
- !ruby/object:Gem::Version
|
|
117
|
+
version: '0'
|
|
118
|
+
type: :development
|
|
119
|
+
prerelease: false
|
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
121
|
+
requirements:
|
|
122
|
+
- - ">="
|
|
123
|
+
- !ruby/object:Gem::Version
|
|
124
|
+
version: '0'
|
|
111
125
|
description: Provides various features that helps keeping the Foreman/Satellite up
|
|
112
126
|
and running.
|
|
113
127
|
email: inecas@redhat.com
|
|
@@ -468,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
468
482
|
- !ruby/object:Gem::Version
|
|
469
483
|
version: '0'
|
|
470
484
|
requirements: []
|
|
471
|
-
rubygems_version: 3.
|
|
485
|
+
rubygems_version: 3.2.33
|
|
472
486
|
signing_key:
|
|
473
487
|
specification_version: 4
|
|
474
488
|
summary: Foreman maintenance tool belt
|