foreman_chef 0.1.6 → 0.1.7
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 +4 -4
- data/app/models/foreman_chef/fact_parser.rb +7 -2
- data/db/seeds.rb +1 -1
- data/lib/foreman_chef/engine.rb +1 -1
- data/lib/foreman_chef/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6796ab6f6a1582885cb7501e0a21f1b13d494a8a
|
|
4
|
+
data.tar.gz: ab358480f7a3e94647b4cd9faed9799229968bb0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7d5a31b0b6cf7ff354f00d037407d58ae24e4f670fe8bf813f3c1ad88ec71393e33704fa37e75639cee30473314c1ecb4c227a8e5fb1e5fa36103116856bc66b
|
|
7
|
+
data.tar.gz: 510e7db1c35c2499bc185838acb178ff678cb9b869ff6517de3e7202ddac7fbc243a847e05e8d90c9f4a46385e1643d118b356f7f8dde67bb80dfb7d82b738d5
|
|
@@ -6,7 +6,12 @@ module ForemanChef
|
|
|
6
6
|
def operatingsystem
|
|
7
7
|
os_name = facts['lsb::id'] || facts['platform']
|
|
8
8
|
release = facts['lsb::release'] || facts['platform_version']
|
|
9
|
-
|
|
9
|
+
# if we have no release information we can't assign OS properly (e.g. missing redhat-lsb)
|
|
10
|
+
if release.nil?
|
|
11
|
+
major, minor = 1, nil
|
|
12
|
+
else
|
|
13
|
+
major, minor = release.split('.')
|
|
14
|
+
end
|
|
10
15
|
description = facts['lsb::description']
|
|
11
16
|
release_name = facts['lsb::codename']
|
|
12
17
|
|
|
@@ -17,7 +22,7 @@ module ForemanChef
|
|
|
17
22
|
klass = Operatingsystem
|
|
18
23
|
end
|
|
19
24
|
|
|
20
|
-
args = { :name => os_name, :major => major, :minor => minor }
|
|
25
|
+
args = { :name => os_name, :major => major.to_s, :minor => minor.to_s }
|
|
21
26
|
klass.where(args).first || klass.new(args.merge(:description => description, :release_name => release_name)).save!
|
|
22
27
|
end
|
|
23
28
|
|
data/db/seeds.rb
CHANGED
|
@@ -16,7 +16,7 @@ end
|
|
|
16
16
|
|
|
17
17
|
# Global parameters used in configuration snippets
|
|
18
18
|
parameters = [
|
|
19
|
-
{ :name => 'chef_handler_foreman_url', :value => SmartProxy.
|
|
19
|
+
{ :name => 'chef_handler_foreman_url', :value => SmartProxy.with_features('Chef').first.try(:url) || Setting.foreman_url },
|
|
20
20
|
{ :name => 'chef_server_url', :value => "https://#{Socket.gethostbyname(Socket.gethostname).first}" },
|
|
21
21
|
{ :name => 'chef_validation_private_key', :value => 'UNSPECIFIED, you must upload your validation key here' },
|
|
22
22
|
{ :name => 'chef_bootstrap_template', :value => 'chef-client omnibus bootstrap' },
|
data/lib/foreman_chef/engine.rb
CHANGED
|
@@ -48,7 +48,7 @@ module ForemanChef
|
|
|
48
48
|
::Hostgroup.send :include, ChefProxyAssociation
|
|
49
49
|
::SmartProxy.send :include, SmartProxyExtensions
|
|
50
50
|
::FactImporter.register_fact_importer(:foreman_chef, ForemanChef::FactImporter)
|
|
51
|
-
::FactParser.
|
|
51
|
+
::FactParser.register_fact_parser(:foreman_chef, ForemanChef::FactParser)
|
|
52
52
|
::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
|
|
53
53
|
::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
|
|
54
54
|
end
|
data/lib/foreman_chef/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_chef
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Marek Hulan
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-08-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|