foreman_maintain 0.5.3 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a02a8286e3a97afd09de77b81a1260acb7edc663286246a4c76accbdf757b68a
|
|
4
|
+
data.tar.gz: 9183a00e78f5162c1ec95630a22cb63a15efeeeb1fb9cf85952bee132e4c5429
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f90ebbd29ab01bf012bdbdd9fc9dee52fcc2812f20853909d8dea0ba5a30ee8b655a67d2b43b8055272447aedfbcbdc82b52d6464334c22ac5f5d17392c50e5d
|
|
7
|
+
data.tar.gz: 1f9147fc144ba7b261bcee85475134d07f1ef5f3d1de9bc5c287d5044499d043fe139c700163122311f36dfd461b73d6b28dec26b7f31281a4bfa992cb4ee795
|
|
@@ -29,7 +29,7 @@ class Features::PuppetServer < ForemanMaintain::Feature
|
|
|
29
29
|
end
|
|
30
30
|
|
|
31
31
|
def puppet_version
|
|
32
|
-
version(execute!(
|
|
32
|
+
version(execute!("#{puppet_path} --version"))
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
def find_empty_cacert_request_files
|
|
@@ -56,6 +56,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
|
|
|
56
56
|
end
|
|
57
57
|
|
|
58
58
|
def puppet_ssldir_path
|
|
59
|
-
execute!(
|
|
59
|
+
execute!("#{puppet_path} config print ssldir")
|
|
60
|
+
end
|
|
61
|
+
|
|
62
|
+
def puppet_path
|
|
63
|
+
'/opt/puppetlabs/bin/puppet'
|
|
60
64
|
end
|
|
61
65
|
end
|
|
@@ -87,8 +87,7 @@ module ForemanMaintain
|
|
|
87
87
|
else
|
|
88
88
|
"rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
|
|
89
89
|
end
|
|
90
|
-
|
|
91
|
-
if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
|
|
90
|
+
if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
|
|
92
91
|
feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
|
|
93
92
|
# TODO: confirm repo for capsule. It might be same repo
|
|
94
93
|
repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
|
|
@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
|
|
|
5
5
|
FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
|
|
6
6
|
|
|
7
7
|
def self.package
|
|
8
|
-
puppet_version = version(execute!('puppet --version'))
|
|
8
|
+
puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
|
|
9
9
|
|
|
10
10
|
puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
|
|
11
11
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_maintain
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Nečas
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-05-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: clamp
|
|
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
378
378
|
- !ruby/object:Gem::Version
|
|
379
379
|
version: '0'
|
|
380
380
|
requirements: []
|
|
381
|
-
rubygems_version: 3.0.
|
|
381
|
+
rubygems_version: 3.0.8
|
|
382
382
|
signing_key:
|
|
383
383
|
specification_version: 4
|
|
384
384
|
summary: Foreman maintenance tool belt
|