foreman_maintain 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba12e565c1d9d7ef2121f766d68231fd287364dbd3f5feb20bb21623fcb046f1
-  data.tar.gz: 70d982478fc721efa83ace6be2544afee4438a826eac4991ba42bf68627e252e
+  metadata.gz: f2f43b5ceb85f627566ba0e4708b3bce0875b26a010afdb438c6be123d8f1e6a
+  data.tar.gz: 47e5d5c3f486a5f6b574c76370282d31fd6e162245f5bc627959ff043ba6b680
 SHA512:
-  metadata.gz: 46ca4a2c64ad3228b85e57e319e9e39413616cea7ba5503206d398c5e921d33d8d796ceb1741865cde4c0229b9729dfabae4b80d3765d822298a4502266063ef
-  data.tar.gz: 7b0a7a51038947db2860e537402c6ccc87f0ea24b01ad051c8dd6a63c6601aea7295a2634ba1fa72cde23ee28d4c5ef56b7981e3ef93bac286b6bbf64c7cf3b0
+  metadata.gz: 1578cc9f64f72126971145298d0ac44949cc254a422511c08e972078f066a88024c5b3400f78756c6a1bf7955e2e2a7bcd24977318a6f2d9a126a28739fa8c08
+  data.tar.gz: a2294861d717873c98a454b83a293402a617bea6aa7f9a44968417eeca6072eee30fa1088c15d0df18853a6cd9c06b73b5638783d9379ad30ec30498eeec5941

data/definitions/features/foreman_database.rb

@@ -16,7 +16,7 @@ class Features::ForemanDatabase < ForemanMaintain::Feature
   end
 
   def config_files
-    if check_min_version('foreman', '2.0')
+    if el7? && check_min_version('foreman', '2.0')
       ['/var/opt/rh/rh-postgresql12/lib/pgsql/data/postgresql.conf']
     else
       ['/var/lib/pgsql/data/postgresql.conf']

data/definitions/features/gofer.rb

@@ -3,7 +3,9 @@ class Features::Gofer < ForemanMaintain::Feature
     label :gofer
 
     confine do
-      find_package('gofer')
+      find_package('gofer') &&
+        ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).exist? &&
+        ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).enabled?
     end
   end
 

data/definitions/features/hammer.rb

@@ -27,6 +27,7 @@ class Features::Hammer < ForemanMaintain::Feature
 
   def setup_admin_access
     return true if check_connection
+
     logger.info('Hammer setup is not valid. Fixing configuration.')
     custom_config = { :foreman => { :username => username } }
     custom_config = on_invalid_host(custom_config)
@@ -42,8 +43,8 @@ class Features::Hammer < ForemanMaintain::Feature
     @ready
   end
 
-  def check_connection
-    @ready = _check_connection
+  def check_connection(config = {})
+    @ready = _check_connection(config)
   end
 
   def server_uri
@@ -55,8 +56,11 @@ class Features::Hammer < ForemanMaintain::Feature
     File.join(fm_config_dir, 'foreman-maintain-hammer.yml')
   end
 
-  def command_base
-    if File.exist?(custom_config_file)
+  def command_base(config = {})
+    if !config.empty?
+      %(RUBYOPT='-W0' LANG=en_US.utf-8 hammer --username "#{config[:foreman][:username]}" \
+        --password "#{config[:foreman][:password]}" --interactive=no)
+    elsif File.exist?(custom_config_file)
       %(RUBYOPT='-W0' LANG=en_US.utf-8 hammer -c "#{custom_config_file}" --interactive=no)
     else
       %(RUBYOPT='-W0' LANG=en_US.utf-8 hammer --interactive=no)
@@ -100,9 +104,7 @@ class Features::Hammer < ForemanMaintain::Feature
 
   def config_error
     raise ForemanMaintain::HammerConfigurationError, 'Hammer configuration failed: '\
-                  'Is the admin credential from the file' \
-                  " #{custom_config_file} correct?\n" \
-                  'Is the server down?'
+                  "Incorrect credential for #{username} user."
   end
 
   def on_missing_password(custom_config)
@@ -131,6 +133,7 @@ class Features::Hammer < ForemanMaintain::Feature
     config_directories.reverse.each do |path|
       full_path = File.expand_path path
       next unless File.directory? full_path
+
       load_from_file(File.join(full_path, 'cli_config.yml'))
       load_from_file(File.join(full_path, 'defaults.yml'))
       # load config for modules
@@ -152,25 +155,28 @@ class Features::Hammer < ForemanMaintain::Feature
 
   def username
     return 'admin' unless feature(:installer)
+
     feature(:installer).initial_admin_username
   end
 
   def password_from_answers(config_username)
     return nil unless feature(:installer)
     return nil unless config_username == feature(:installer).initial_admin_username
+
     feature(:installer).initial_admin_password
   end
 
   def save_config_and_check(config)
-    save_config(config)
-    check_connection
+    config[:foreman][:password] ? check_connection(config) : check_connection
+    save_config(config) if ready?
   end
 
   def save_config(config)
     File.open(custom_config_file, 'w', 0o600) { |f| f.puts YAML.dump(config) }
   end
 
-  def _check_connection
-    `#{command_base} user list --per-page 1 2>&1` && $CHILD_STATUS.exitstatus == 0
+  def _check_connection(config = {})
+    cmd = "#{command_base(config)} user list --per-page 1 2>&1"
+    `#{cmd}` && $CHILD_STATUS.exitstatus == 0
   end
 end

data/definitions/procedures/restore/installer_reset.rb

@@ -21,8 +21,7 @@ module Procedures::Restore
       # already ran since this is to be run on an existing system, which means installer checks
       # has already been skipped
       if feature(:foreman_proxy) &&
-         feature(:foreman_proxy).with_content? &&
-         check_min_version('katello-installer-base', '3.2.0')
+         feature(:foreman_proxy).with_content?
         installer << '--disable-system-checks '
       end
       installer

data/lib/foreman_maintain/cli/packages_command.rb

@@ -58,7 +58,7 @@ module ForemanMaintain
       end
 
       subcommand 'is-locked', 'Check if update of packages is allowed' do
-        interactive_option([])
+        interactive_option(['assumeyes'])
         def execute
           locked = ForemanMaintain.package_manager.versions_locked?
           puts "Packages are#{locked ? '' : ' not'} locked"

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.7'.freeze
+  VERSION = '0.8.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp