foreman_maintain 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8f35db6a3abfa83bcb5570efadb4e1bf8af20c4375dbf53b58eba26e9c0e08
-  data.tar.gz: a7a449095345a738b168a8e5657804426855e66d53d46686a3b0fe391d661932
+  metadata.gz: 92257cd7abfa6ce1234f0d5223197de9c804a8f1aea3f6f9ceb1afc4fcaacb52
+  data.tar.gz: 6dd2767bd384cc19871242c8bf68499b9c6d3b641584ab18685e6c0f3c6bcfed
 SHA512:
-  metadata.gz: 5d7556a2fd54939fe0aa1b80f6156f2df7427dfb962f746d0e0d58ab77038b1ed1b4e25105f46884c8b3f1a7d7aea53508f968c1c799d91a96bc3aa008298ff2
-  data.tar.gz: f67c0fac6450e02f4485ad2c8428867e3ba49430fcadf808fd32d79564bcaec18ad10e923277a454e809f8acd2a9403169864b7328f1af42962a5a3776eadf8f
+  metadata.gz: b60d2b4b6b9c19fbcc75a31aaef0fe79d155477215a88fa4a4b6ece8d92e4c69901ed50766db333934ce7ce84e120a45aa51eb1e5799b25e615881ad26ad190a
+  data.tar.gz: b0790929f26f2cdf667551ec1ded6aaf312c49c804a6defaacbe23524ac23c1f213d440d090e369168593141582231b05c4c2b5f426379ce5e6c842ec2a31c88

data/definitions/features/candlepin_database.rb

@@ -75,7 +75,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
   # rubocop:enable Metrics/MethodLength
 
   def extend_with_db_options
-    db_options = { '-d' => construct_database_string }
+    db_options = { '-d' => configuration['database'] }
     if check_option_using_cpdb_help('dbhost')
       db_options['--dbhost'] = configuration['host']
       db_options['--dbport'] = configuration['port']
@@ -83,15 +83,6 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     db_options
   end
 
-  def construct_database_string
-    db_str = configuration['database']
-    extra_opts = []
-    extra_opts << "ssl=#{configuration['ssl']}" if configuration['ssl']
-    extra_opts << "sslfactory=#{configuration['sslfactory']}" if configuration['sslfactory']
-    db_str += "?#{extra_opts.join('&')}" unless extra_opts.empty?
-    db_str
-  end
-
   def fetch_extra_param(url, key_name)
     query_string = url.split('?')[1]
     return nil unless query_string

data/definitions/procedures/content/fix_pulpcore_artifact_permissions.rb

@@ -5,7 +5,8 @@ module Procedures::Content
       param :assumeyes, 'Do not ask for confirmation', :default => false
 
       confine do
-        check_min_version(foreman_plugin_name('katello'), '4.0')
+        check_min_version(foreman_plugin_name('katello'), '4.0') &&
+          Dir.exist?('/var/lib/pulp/media/artifact')
       end
     end
 

data/definitions/scenarios/upgrade_to_capsule_6_11.rb

@@ -40,6 +40,7 @@ module Scenarios::Capsule_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_capsule_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Capsule_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -42,6 +42,7 @@ module Scenarios::Satellite_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Satellite_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/extras/foreman_protector/foreman-protector.whitelist

@@ -17,8 +17,28 @@ boost-random
 boost-iostreams
 boost-thread
 yum-utils
+# el7 psql client dependencies
+rh-postgresql12-postgresql
+rh-postgresql12-postgresql-libs
+rh-postgresql12-runtime
 # el8 yum-utils dependencies
 dnf-plugins-core
 python3-dnf-plugins-core
+# el8 nftables dependencies
+nftables
+firewalld
+firewalld-filesystem
+ipset
+ipset-libs
+iptables
+iptables-etables
+iptables-libs
+libnetfilter_conntrack
+libnffnetlink
+libnftnl
+python3-firewall
+python3-nftables
+python3-slip
+python3-slip-dbus
 # foreman-maintain
 rubygem-foreman_maintain

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -454,7 +454,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -469,8 +469,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []