foreman_maintain 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a34b76c9a33401d8fdcdd6060d927ec7524bbe4
-  data.tar.gz: 650f353493cb6d4ba3f8f74645fd214e7eb3829f
+  metadata.gz: fe76d1f70ac466bed07284b762f9a30b852efb55
+  data.tar.gz: 73a74651ba0e6bc1fb2c702c2c8e77e652caaed9
 SHA512:
-  metadata.gz: 3c5775e4e063a09e46511cf7ddc8803ccefb3ab512d7b7c7c6e74d4d9164b27437715474a9100221dd82bc3f80425190c9ee9e84d52bfb771f282fef11a4879a
-  data.tar.gz: 5a34a85f37bc1295a3ec1591b71e8d3782a839b3de2c2433bb43b09634d112137d59aa1fb4c94f644f4cabf8b349a83e4cc232b2392291dfc88c81a113458b12
+  metadata.gz: 01dd6c5e2568e26e806e04fcd004bb9ba26fce1e024f6801b13ad4c1a74d97bc04fe59a1bfcbf657e46d05c36dde616215f56ba69f7d68c876f0db78647daf5d
+  data.tar.gz: 37b5e13bcfbd1d35a987977e7c7ccf93c3b995ce8eed9d3a6716aa0fb27dd6e014edf20b01c45d90b9349f8d1a4d34390d3fc7241d6ce355aced7db30221853e

data/config/foreman-maintain-hammer.yml

@@ -0,0 +1,4 @@
+---
+:foreman:
+  :username: admin
+  :password: changeme

data/config/foreman_maintain.yml

@@ -3,19 +3,14 @@
 :log_dir: 'log'
 
 # Logger levels: mention one of debug, info, warning, error, fatal
-:log_level: 'error'
-
-# Mention log file size in KB. Default set to 10000KB.
-# :log_file_size: 10000
+# :log_level: 'debug'
 
 # Mention definitions directories. Default
 # :definitions_dirs:
 
 # Mention file path to store data
-# :storage_file: 'data.yml'
+:storage_file: 'data.yml'
 
 # Mention directory to store whole backup data
-:backup_dir: '/tmp/foreman-maintain'
+:backup_dir: '/var/lib/foreman-maintain'
 
-# Mention path where foreman-proxy certificates stored on filesystem
-# :foreman_proxy_cert_path: '/etc/foreman'

data/definitions/features/downstream.rb

@@ -60,7 +60,7 @@ class Features::Downstream < ForemanMaintain::Feature
 
     rh_repos.concat(sat_and_tools_repos(rh_version_major, sat_version))
 
-    rh_repos << 'rhel-7-server-ansible-2-rpms' if sat_version.to_s == '6.4'
+    rh_repos << 'rhel-7-server-ansible-2.6-rpms' if sat_version.to_s == '6.4'
 
     if current_minor_version == '6.3' && sat_version.to_s != '6.4' && (
       feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)

data/definitions/features/foreman_tasks.rb

@@ -108,11 +108,11 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def services
-    if check_min_version('foreman', '1.17')
-      { 'dynflowd' => 30 }
-    else
-      { 'foreman-tasks' => 30 }
-    end
+    { service_name => 30 }
+  end
+
+  def service_name
+    check_min_version('foreman', '1.17') ? 'dynflowd' : 'foreman-tasks'
   end
 
   private

data/definitions/features/gofer.rb

@@ -0,0 +1,15 @@
+class Features::Gofer < ForemanMaintain::Feature
+  metadata do
+    label :gofer
+
+    confine do
+      find_package('gofer')
+    end
+  end
+
+  def services
+    {
+      'goferd' => 30
+    }
+  end
+end

data/definitions/features/hammer.rb

@@ -11,14 +11,6 @@ class Features::Hammer < ForemanMaintain::Feature
     end
   end
 
-  SERVICES_MAPPING = {
-    'candlepin_auth' => %w[postgresql tomcat],
-    'candlepin' => %w[postgresql tomcat],
-    'pulp_auth' => %w[pulp_resource_manager pulp_workers pulp_celerybeat],
-    'pulp' => %w[pulp_resource_manager pulp_workers pulp_celerybeat],
-    'foreman_tasks' => %w[foreman-tasks]
-  }.freeze
-
   def initialize
     @configuration = { :foreman => {} }
     @config_files = []
@@ -145,10 +137,25 @@ class Features::Hammer < ForemanMaintain::Feature
     resources_failed
   end
 
+  def related_services(resource)
+    case resource
+    when 'candlepin_auth'
+      %w[postgresql tomcat]
+    when 'candlepin'
+      %w[postgresql tomcat]
+    when 'pulp_auth'
+      %w[pulp_resource_manager pulp_workers pulp_celerybeat]
+    when 'pulp'
+      %w[pulp_resource_manager pulp_workers pulp_celerybeat]
+    when 'foreman_tasks'
+      [feature(:foreman_tasks).service_name]
+    end
+  end
+
   def map_resources_with_services(resources)
     service_names = []
     resources.each do |resource|
-      service_names.concat(SERVICES_MAPPING[resource])
+      service_names.concat(related_services(resource))
     end
     service_names
   end

data/definitions/features/katello.rb

@@ -17,10 +17,7 @@ class Features::Katello < ForemanMaintain::Feature
 
   def services
     {
-      'qpidd'                    => 10,
-      'qdrouterd'                => 10,
-      'goferd'                   => 30,
-      'elasticsearch'            => 30
+      'elasticsearch' => 30
     }
   end
 

data/definitions/features/pulp.rb

@@ -10,10 +10,13 @@ class Features::Pulp < ForemanMaintain::Feature
   def services
     {
       'squid'                    => 10,
+      'qpidd'                    => 10,
+      'qdrouterd'                => 10,
       'pulp_workers'             => 20,
       'pulp_celerybeat'          => 20,
       'pulp_resource_manager'    => 20,
-      'pulp_streamer'            => 20
+      'pulp_streamer'            => 20,
+      'httpd'                    => 30
     }
   end
 

data/definitions/procedures/packages/update.rb

@@ -7,7 +7,7 @@ module Procedures::Packages
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-      clean_all_packages(:assumeyes => assumeyes_val)
+      clean_all_packages
       packages_action(:update, @packages, :assumeyes => assumeyes_val)
     end
 

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -116,13 +116,9 @@ module ForemanMaintain
                  :interactive => true)
       end
 
-      def clean_all_packages(options = {})
-        options.validate_options!(:assumeyes)
-        yum_options = []
-        yum_options << '-y' if options[:assumeyes]
-        execute!("yum #{yum_options.join(' ')} clean all", :interactive => true)
-        execute!('rm -rf /var/cache/yum')
-        execute!('rm -rf /var/cache/dnf')
+      def clean_all_packages
+        execute!('dnf clean all') if find_package('dnf')
+        execute!('yum clean all') if find_package('yum')
       end
 
       def package_version(name)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -113,6 +113,7 @@ files:
 - bin/foreman-maintain-complete
 - bin/foreman-maintain-rotate-tar
 - bin/passenger-recycler
+- config/foreman-maintain-hammer.yml
 - config/foreman-maintain.completion
 - config/foreman_maintain.yml
 - config/foreman_maintain.yml.example
@@ -153,6 +154,7 @@ files:
 - definitions/features/foreman_proxy.rb
 - definitions/features/foreman_server.rb
 - definitions/features/foreman_tasks.rb
+- definitions/features/gofer.rb
 - definitions/features/hammer.rb
 - definitions/features/installer.rb
 - definitions/features/instance.rb
@@ -315,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt