foreman_maintain 1.2.0 → 1.2.2

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: 5bf9227086619d4fb28185c0fdb796c7045b9f35ea52df8fc3d9aa1a45fbb85d
4
- data.tar.gz: 77281b4efd0cb3b2d1e6fed2badce28d183dcb7b16d65246987f57407eb92642
3
+ metadata.gz: f1b6168d49244a6f59fd0500867fa753c55545cbb299af9c4572ca814d072927
4
+ data.tar.gz: d5bf3284f717958e4fd3dec1adea6b7f71a67fa854c23457915aeb0417017604
5
5
  SHA512:
6
- metadata.gz: 3b2e771c53927fa0f637da5a5066eb1afecbfe7876b9a241a68dfc8300ac82f8835fa308a42742d7b2a126716bac825e37179ddd91695a529de0b64e5272e245
7
- data.tar.gz: 283f7004e4268f19cadc052dcd044273be28f96e786fd012bca57692276a3765eaded4848a596a66efdfe36d490870f6cfbbee07ccfa4c0dcdcf6362a9fda740
6
+ metadata.gz: 6d735d3febc81e314bcbe0dc8649536f34998f72aa2b1851c4d568fd90b38cb46dac41dd1ce24d9845c8135abecf90742d0ff9aef6afc03188362420dc1df936
7
+ data.tar.gz: 4975f14be4a458950c88c3eb3b3edc0fccdd988e134a913c6fb5e7e2dcfdb29dd43ae11dcd5978673d5c0d468c3155a3cd91254d1caed89789038404b034805e
@@ -3,17 +3,27 @@ class Features::Apache < ForemanMaintain::Feature
3
3
  label :apache
4
4
 
5
5
  confine do
6
- find_package('httpd')
6
+ find_package(package_name)
7
7
  end
8
8
  end
9
9
 
10
10
  def services
11
11
  [
12
- system_service('httpd', 30)
12
+ system_service(self.class.package_name, 30)
13
13
  ]
14
14
  end
15
15
 
16
16
  def config_files
17
- ['/etc/httpd']
17
+ ["/etc/#{self.class.package_name}"]
18
+ end
19
+
20
+ class << self
21
+ def package_name
22
+ if debian?
23
+ 'apache2'
24
+ else
25
+ 'httpd'
26
+ end
27
+ end
18
28
  end
19
29
  end
@@ -4,7 +4,6 @@ class Features::Gofer < ForemanMaintain::Feature
4
4
 
5
5
  confine do
6
6
  find_package('gofer') &&
7
- ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).exist? &&
8
7
  ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).enabled?
9
8
  end
10
9
  end
@@ -60,13 +60,13 @@ class Features::Instance < ForemanMaintain::Feature
60
60
  end
61
61
  end
62
62
 
63
- def foreman_server_ssl_ca
64
- @foreman_server_ssl_ca ||= feature(:installer).answers['foreman']['server_ssl_ca']
63
+ def server_connection_ca_file
64
+ @server_connection_ca_file ||= feature(:installer).answers['foreman']['server_ssl_chain']
65
65
  end
66
66
 
67
67
  def server_connection
68
68
  net = Net::HTTP.new(ForemanMaintain.config.foreman_url, ForemanMaintain.config.foreman_port)
69
- net.ca_file = foreman_server_ssl_ca
69
+ net.ca_file = server_connection_ca_file
70
70
  net.use_ssl = true
71
71
  net
72
72
  end
@@ -7,7 +7,6 @@ class Features::Pulp < ForemanMaintain::Feature
7
7
 
8
8
  confine do
9
9
  !check_min_version('katello-common', '4.0') &&
10
- ForemanMaintain::Utils::Service::Systemd.new('pulp_resource_manager', 0).exist? &&
11
10
  ForemanMaintain::Utils::Service::Systemd.new('pulp_resource_manager', 0).enabled?
12
11
  end
13
12
  end
@@ -5,8 +5,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
5
5
  label :pulpcore
6
6
 
7
7
  confine do
8
- ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).exist? &&
9
- ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).enabled?
8
+ ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).enabled?
10
9
  end
11
10
  end
12
11
 
@@ -0,0 +1,24 @@
1
+ class Features::SaltServer < ForemanMaintain::Feature
2
+ metadata do
3
+ label :salt_server
4
+
5
+ confine do
6
+ find_package('salt-master') &&
7
+ ForemanMaintain::Utils::Service::Systemd.new('salt-master', 0).enabled?
8
+ end
9
+ end
10
+
11
+ def config_files
12
+ [
13
+ '/etc/salt'
14
+ ]
15
+ end
16
+
17
+ def services
18
+ salt_services = [system_service('salt-master', 30)]
19
+ if ForemanMaintain::Utils::Service::Systemd.new('salt-api', 0).enabled?
20
+ salt_services += [system_service('salt-api', 30)]
21
+ end
22
+ salt_services
23
+ end
24
+ end
@@ -23,7 +23,8 @@ module Procedures::Pulp
23
23
  '/var/lib/pulp/importers',
24
24
  '/var/lib/pulp/uploads',
25
25
  '/var/lib/mongodb/',
26
- '/var/cache/pulp'
26
+ '/var/cache/pulp',
27
+ '/var/spool/squid'
27
28
  ].select { |dir| File.directory?(dir) }
28
29
  end
29
30
 
@@ -21,7 +21,8 @@ module Procedures::Restore
21
21
  # already ran since this is to be run on an existing system, which means installer checks
22
22
  # has already been skipped
23
23
  if feature(:foreman_proxy) &&
24
- feature(:foreman_proxy).with_content?
24
+ feature(:foreman_proxy).with_content? &&
25
+ check_max_version('foreman-installer', '3.4')
25
26
  installer << '--disable-system-checks '
26
27
  end
27
28
  installer
@@ -56,6 +56,8 @@ module Scenarios::Capsule_6_12
56
56
 
57
57
  def compose
58
58
  add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
59
+ modules_to_enable = ["satellite-capsule:#{el_short_name}"]
60
+ add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
61
  add_step(Procedures::Packages::UnlockVersions.new)
60
62
  add_step(Procedures::Packages::Update.new(:assumeyes => true))
61
63
  add_step_with_context(Procedures::Installer::Upgrade)
@@ -56,6 +56,8 @@ module Scenarios::Capsule_6_12_z
56
56
 
57
57
  def compose
58
58
  add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
59
+ modules_to_enable = ["satellite-capsule:#{el_short_name}"]
60
+ add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
61
  add_step(Procedures::Packages::UnlockVersions.new)
60
62
  add_step(Procedures::Packages::Update.new(:assumeyes => true))
61
63
  add_step_with_context(Procedures::Installer::Upgrade)
@@ -57,6 +57,8 @@ module Scenarios::Satellite_6_12
57
57
 
58
58
  def compose
59
59
  add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
60
+ modules_to_enable = ["satellite:#{el_short_name}"]
61
+ add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
60
62
  add_step(Procedures::Packages::UnlockVersions.new)
61
63
  add_step(Procedures::Packages::Update.new(:assumeyes => true))
62
64
  add_step_with_context(Procedures::Installer::Upgrade)
@@ -56,6 +56,8 @@ module Scenarios::Satellite_6_12_z
56
56
 
57
57
  def compose
58
58
  add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
59
+ modules_to_enable = ["satellite:#{el_short_name}"]
60
+ add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
59
61
  add_step(Procedures::Packages::UnlockVersions.new)
60
62
  add_step(Procedures::Packages::Update.new(:assumeyes => true))
61
63
  add_step_with_context(Procedures::Installer::Upgrade)
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '1.2.0'.freeze
2
+ VERSION = '1.2.2'.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.2.0
4
+ version: 1.2.2
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-01 00:00:00.000000000 Z
11
+ date: 2023-01-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: clamp
@@ -223,6 +223,7 @@ files:
223
223
  - definitions/features/pulpcore_database.rb
224
224
  - definitions/features/puppet_server.rb
225
225
  - definitions/features/redis.rb
226
+ - definitions/features/salt_server.rb
226
227
  - definitions/features/satellite.rb
227
228
  - definitions/features/service.rb
228
229
  - definitions/features/sync_plans.rb
@@ -490,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
490
491
  - !ruby/object:Gem::Version
491
492
  version: '0'
492
493
  requirements: []
493
- rubygems_version: 3.2.33
494
+ rubygems_version: 3.3.26
494
495
  signing_key:
495
496
  specification_version: 4
496
497
  summary: Foreman maintenance tool belt