foreman_maintain 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85dd75e0de03c6b2c872e728ba047ecde645148d
-  data.tar.gz: 93d8cc2e2381e5c890c62f114b2a3f3ad9c9b460
+  metadata.gz: 4ba0d1619770cae069e142f20a49d40591000521
+  data.tar.gz: f3ffcb2023e8070b5dc5764f9496654a32c65687
 SHA512:
-  metadata.gz: 8b307b932f52b3b9686ecca55c5904d4b901f71429e0fc485ddce9cff419026aaa96393b413dce528001c74ed0e11f03ba7ab73c280f66663dbad6b03299ef80
-  data.tar.gz: bcc8b92ff358e1e5c3c4c129278af67566dfc09681e7d338330a20718a955acd5fce84b939b40738beb0f3f0fb81990632aec7bb3e37a600ea5cdfcecf9ed71e
+  metadata.gz: 2f14ff8e193e7f421f7d7e9c3183013abdc7b83d3d7eda31faa09502f561a3cb7a9069afd1301a3d59d5f48f2dadda36929ae5d4515d950d2b525ff1e317406b
+  data.tar.gz: c9c14e9df45fcfcadf4a2a3ea2e710b30edd698f9c4cc19c1f0b52b3690c4ffaf23b9b9d6749b8e091cdca3fb8e4a167a84781ec857c287e25c5f8afed479bf1

data/definitions/checks/repositories/validate.rb

@@ -2,6 +2,9 @@ module Checks::Repositories
   class Validate < ForemanMaintain::Check
     metadata do
       description 'Validate availability of repositories'
+      preparation_steps do
+        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+      end
 
       confine do
         feature(:downstream)

data/definitions/features/downstream.rb

@@ -46,17 +46,32 @@ class Features::Downstream < ForemanMaintain::Feature
 
   def rh_repos(sat_version)
     sat_version = version(sat_version)
-    rh_version_major = execute!('facter operatingsystemmajrelease')
-    sat_version_full = "#{sat_version.major}.#{sat_version.minor}"
+    rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
+
+    rh_repos = main_rh_repos(rh_version_major)
+
+    rh_repos.concat(sat_and_tools_repos(rh_version_major, sat_version))
+
+    if current_minor_version == '6.3' && sat_version.to_s != '6.4' && (
+      feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
+      rh_repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
+    end
 
+    rh_repos
+  end
+
+  def sat_and_tools_repos(rh_version_major, sat_version)
+    sat_version_full = "#{sat_version.major}.#{sat_version.minor}"
     sat_repo_id = "rhel-#{rh_version_major}-server-satellite-#{sat_version_full}-rpms"
     sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{sat_version_full}-rpms"
 
+    [sat_repo_id, sat_tools_repo_id]
+  end
+
+  def main_rh_repos(rh_version_major)
     ["rhel-#{rh_version_major}-server-rpms",
      "rhel-server-rhscl-#{rh_version_major}-rpms",
-     "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
-     sat_tools_repo_id,
-     sat_repo_id]
+     "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"]
   end
 
   def version_from_source

data/definitions/features/puppet_server.rb

@@ -0,0 +1,20 @@
+class Features::PuppetServer < ForemanMaintain::Feature
+  metadata do
+    label :puppet_server
+
+    # We only check puppetserver and not puppet-server, as puppet-server
+    # is a part of httpd and relies on httpd service to restart, therefore
+    # not requiring a separate service to restart
+    confine do
+      find_package('puppetserver') || find_package('puppet')
+    end
+  end
+
+  def services
+    find_package('puppetserver') ? { 'puppetserver' => 30 } : {}
+  end
+
+  def puppet_version
+    version(execute!('puppet --version'))
+  end
+end

data/definitions/procedures/repositories/setup.rb

@@ -2,6 +2,10 @@ module Procedures::Repositories
   class Setup < ForemanMaintain::Procedure
     metadata do
       description 'Setup repositories'
+      preparation_steps do
+        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+      end
+
       confine do
         feature(:downstream) || feature(:upstream)
       end

data/lib/foreman_maintain/utils/facter.rb

@@ -0,0 +1,21 @@
+module ForemanMaintain::Utils
+  module Facter
+    include ForemanMaintain::Concerns::SystemHelpers
+
+    FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
+
+    def self.package
+      puppet_version = version(execute!('puppet --version'))
+
+      puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
+    end
+
+    def self.path
+      FACTER_FILES.find { |path| File.exist?(path) }
+    end
+
+    def self.os_major_release
+      execute!("#{path} operatingsystemmajrelease")
+    end
+  end
+end

data/lib/foreman_maintain/utils.rb

@@ -2,3 +2,4 @@ require 'foreman_maintain/utils/command_runner'
 require 'foreman_maintain/utils/disk'
 require 'foreman_maintain/utils/hammer'
 require 'foreman_maintain/utils/curl_response'
+require 'foreman_maintain/utils/facter'

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -135,6 +135,7 @@ files:
 - definitions/features/katello.rb
 - definitions/features/katello_service.rb
 - definitions/features/pulp.rb
+- definitions/features/puppet_server.rb
 - definitions/features/sync_plans.rb
 - definitions/features/upstream.rb
 - definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb
@@ -210,6 +211,7 @@ files:
 - lib/foreman_maintain/utils/disk/io/file_system.rb
 - lib/foreman_maintain/utils/disk/nil_device.rb
 - lib/foreman_maintain/utils/disk/stats.rb
+- lib/foreman_maintain/utils/facter.rb
 - lib/foreman_maintain/utils/hammer.rb
 - lib/foreman_maintain/version.rb
 - lib/foreman_maintain/yaml_storage.rb