foreman_default_hostgroup 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjlmNWYzMGJjMGZiMTNiNWYwNTU4YTJiNThlYjk5MjZhZjBhYzM0Yw==
+    MDQ3MDU3NTRiNDNkNmExNzcxNmJlZDBmMDM3N2NkOWJhZGQxNTExZg==
   data.tar.gz: !binary |-
-    Yjg1MjJhMTFlYzY0YjQ4YWM2MTdlY2E3YjY4YmFkYmM3Njc0ZjZmMw==
+    OWNkODUwM2VmYTk4YWFhYzQ2MDViZWRlZTQyZTNlMWE1ZTA5MDFlNQ==
 SHA512:
   metadata.gz: !binary |-
-    YTMzNGEzNDA3OGM1YTEwZGQ4MmRhMWI0MjZlYzgwNzZiYmE0MGE2NDZjYjMz
-    NGU5OGI0ZGQ4YTMyMWE1NzcxOTY0OWQ5ODlmYmQ4ODU4YjA0NWM0MzhhZTkz
-    NDczODMwNDRiNTNjN2FhYjgxODdhMzM5YjFlM2IwZTk5YTU0MzM=
+    NGIyZWZmN2NmNTZkMDNjZWJhMjViMTk4NWU1MWU3ODUxMzczZmVlODgzNTg1
+    MmExYjU2MzAxMWIwNjViY2MyNGQ3MzVjMWVjNmY3YjQzOTM4MGUwOGViMzk3
+    NjVjZDk2NDQ0MThhZmRiODc4YjQ5NzJiY2EwYWI2ZjJhZTg3Y2I=
   data.tar.gz: !binary |-
-    NjliZmFjMTEyZWUzYTQ0MWJlZmI5Y2IxYTA5MDU3N2FiNGE2YWE3NmY3MDk1
-    YjVmYzQyMjUyMzMyOGZlMDlmNThjMjI0NWZjZDNkMWEwNjk5MjBiYmNiYzkw
-    NWVlNWUwMWJhYTkyZGRlMjdiODdmODg3YzhhNGM5NDVmOWI3Y2I=
+    ZTFkMzZlZTgyMjBkYTJkYmI2Nzk2OTQ4YTlkN2UxMzg4ZjdhZDk3YjZiMmJh
+    OTQ5MTZkYjIwNjIxZGRkZDNiYWUzZjkwY2YxNWE1ZGRhYzIwZjc4ZmIxNzBk
+    ZjBjMzE3ZDRjYzUxMzVkOGFhNGI4NDVmN2QyYjQzOTBkOGE5Y2M=

data/README.md

@@ -15,7 +15,7 @@ for how to install Foreman plugins
 | <= 1.2          | 0.1.0          |
 |    1.3          | 1.0.1          |
 |    1.4          | 1.1.0          |
-| >= 1.5          | 2.0.0          |
+| >= 1.5          | 2.0.1          |
 
 ## Usage
 

data/lib/default_hostgroup_managed_host_patch.rb

@@ -10,11 +10,14 @@ module DefaultHostgroupManagedHostPatch
 
   module ClassMethods
     def import_host_and_facts_with_match_hostgroup hostname, facts, certname = nil, proxy_id = nil
-      raise Foreman::Exception.new "Could not load default_hostgroup settings, check config" unless SETTINGS[:default_hostgroup]
-      raise Foreman::Exception.new "Could not load default_hostgroup map from settings, check config." unless SETTINGS[:default_hostgroup][:map]
+      host, result = import_host_and_facts_without_match_hostgroup(hostname, facts, certname, proxy_id)
+
+      unless SETTINGS[:default_hostgroup] && SETTINGS[:default_hostgroup][:map]
+        Rails.logger.warn "DefaultHostgroupMatch: Could not load default_hostgroup map from settings, check config."
+        return host, result
+      end
 
       Rails.logger.debug "DefaultHostgroupMatch: performing Hostgroup match"
-      host, result = import_host_and_facts_without_match_hostgroup(hostname, facts, certname, proxy_id)
 
       if Setting[:force_hostgroup_match_only_new]
         # host.new_record? will only test for the early return in the core method, a real host

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Greg Sutcliffe