foreman_maintain 1.1.5 → 1.1.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d5168b856e2af86bdafed767d362dae19556dcc0b72d6e5e600f097b195de2ed
4
- data.tar.gz: 4399bf04c5108dd0e63cdd917c27238d10952fc962a44ffcf6cf18b628d439f5
3
+ metadata.gz: 91f6ed30cd64c8a77327a681177355d94c2afc783ebad3c6341353ac1930d2ef
4
+ data.tar.gz: ae2a2c770198febfeb4037a883b6b03a02498f0e461ce9acf4bc6661ae9ef7e7
5
5
  SHA512:
6
- metadata.gz: a0b7212318f4d888fdca2d01685466dace2b65a1a9d0147f733ccc12e2f41d9a83244f13195836ba465a5280819d687de41b3d89092d94bb22af8b8cedc9df20
7
- data.tar.gz: 4b03699dad54a36fff8b765e1d3cbc673da5dae0e012de3fccd42623f9bba4dd2110cceae92c0826b0e7b72933705764e1507f3f5869e13801588f8fc9b28bb9
6
+ metadata.gz: 372122b9854841be9b61c16dc4e32456b917348413cca28d5ebb930c1753e456818d70278c4d74da64d9096b092d5ccaced4aac2bfe62d46ec59333f86844c9d
7
+ data.tar.gz: 170d5f54b55dbbe4e91b7bfca2842d0f9c0f4389844208f558b6944b61e086a7cd7edc378c1a27e37f7d09e5eb326b31c7a96c00daf2807f59cf82596815f8da
@@ -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' => construct_database_string }
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,8 +2,7 @@ module ForemanMaintain::Scenarios
2
2
  class SelfUpgradeBase < ForemanMaintain::Scenario
3
3
  include ForemanMaintain::Concerns::Downstream
4
4
  def target_version
5
- current_full_version = feature(:instance).downstream.current_version
6
- @target_version ||= current_full_version.bump
5
+ @target_version ||= current_version.bump
7
6
  end
8
7
 
9
8
  def current_version
@@ -17,8 +17,28 @@ boost-random
17
17
  boost-iostreams
18
18
  boost-thread
19
19
  yum-utils
20
+ # el7 psql client dependencies
21
+ rh-postgresql12-postgresql
22
+ rh-postgresql12-postgresql-libs
23
+ rh-postgresql12-runtime
20
24
  # el8 yum-utils dependencies
21
25
  dnf-plugins-core
22
26
  python3-dnf-plugins-core
27
+ # el8 nftables dependencies
28
+ nftables
29
+ firewalld
30
+ firewalld-filesystem
31
+ ipset
32
+ ipset-libs
33
+ iptables
34
+ iptables-etables
35
+ iptables-libs
36
+ libnetfilter_conntrack
37
+ libnffnetlink
38
+ libnftnl
39
+ python3-firewall
40
+ python3-nftables
41
+ python3-slip
42
+ python3-slip-dbus
23
43
  # foreman-maintain
24
44
  rubygem-foreman_maintain
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '1.1.5'.freeze
2
+ VERSION = '1.1.7'.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.1.5
4
+ version: 1.1.7
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-09-14 00:00:00.000000000 Z
11
+ date: 2022-09-26 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
@@ -469,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
469
483
  - !ruby/object:Gem::Version
470
484
  version: '0'
471
485
  requirements: []
472
- rubygems_version: 3.3.7
486
+ rubygems_version: 3.2.33
473
487
  signing_key:
474
488
  specification_version: 4
475
489
  summary: Foreman maintenance tool belt