foreman_maintain 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9ae9b6099e8b494c3bd72de977bbb13df4040e3d45e020f9b3d53b47191da8
-  data.tar.gz: b929d4cf51029647d5762162e4de9a1e9d5393f7d67ec0c2f5e9bef59d551d67
+  metadata.gz: a02a8286e3a97afd09de77b81a1260acb7edc663286246a4c76accbdf757b68a
+  data.tar.gz: 9183a00e78f5162c1ec95630a22cb63a15efeeeb1fb9cf85952bee132e4c5429
 SHA512:
-  metadata.gz: 66b859da44e61e69966b3dc929043f82cc09e0a602f51f6e4f46dff2b95cdbbc987c58fba53e492f1c4797f36f017fd93d9bc9a9d16f3caeb80e6d4aa284bdb1
-  data.tar.gz: 92e29e11ba269e8cc650d5f119f4afbc6ab730e69495b725a612370f03941781ffcbe0f37a13669189345d304c772e82310be2a1b926429f870dbcfcdf15da3a
+  metadata.gz: f90ebbd29ab01bf012bdbdd9fc9dee52fcc2812f20853909d8dea0ba5a30ee8b655a67d2b43b8055272447aedfbcbdc82b52d6464334c22ac5f5d17392c50e5d
+  data.tar.gz: 1f9147fc144ba7b261bcee85475134d07f1ef5f3d1de9bc5c287d5044499d043fe139c700163122311f36dfd461b73d6b28dec26b7f31281a4bfa992cb4ee795

data/definitions/features/puppet_server.rb

@@ -29,7 +29,7 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_version
-    version(execute!('puppet --version'))
+    version(execute!("#{puppet_path} --version"))
   end
 
   def find_empty_cacert_request_files
@@ -56,6 +56,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_ssldir_path
-    execute!('puppet master --configprint ssldir')
+    execute!("#{puppet_path} config print ssldir")
+  end
+
+  def puppet_path
+    '/opt/puppetlabs/bin/puppet'
   end
 end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -87,8 +87,7 @@ module ForemanMaintain
                  else
                    "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
                  end
-
-        if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
+        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
           # TODO: confirm repo for capsule. It might be same repo
           repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"

data/lib/foreman_maintain/utils/facter.rb

@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
     FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
 
     def self.package
-      puppet_version = version(execute!('puppet --version'))
+      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
 
       puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
     end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt