foreman_default_hostgroup 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a6b0143d9889fb4302f38b6a92850aa724a367
-  data.tar.gz: 7e74dba1ddcd2cdbdadb07c624ac6e9556d0397c
+  metadata.gz: 80eeeefe5330eb909cbff3b1945df18fd64b5270
+  data.tar.gz: a31c296a3e787879056a7f167f6ae4e31a9ce999
 SHA512:
-  metadata.gz: 91f93da69dae782a3b52ee958eed4abb554780d9801b3f06f9b515f7bcb1e17e42817245de14f87ee060a0ab9b2df650cc5d258bc75ff896ef5e9a38efd3ae97
-  data.tar.gz: 36b6e5428a3557e24efd87ab551d9cf38446418842a385ccd2da8f350e1e38a335064a365c3e8009defd7b335b5e7ceeb2cbf931a61fcd379b1ef462dd1134c1
+  metadata.gz: df1e1a9fbf5adefc691245525c284125a3e7f19f29043189e5a0c402dd9468ad860326feee0fb0195fd32d14a809e2abd67f98dac397017f29256df0a873b1f5
+  data.tar.gz: 3d03a685af3174d5ba437330fee1172539b2cdd4961aa4e67bc7dcefadfb4b6228ea7d3e7e9df6595b7b24be17ab3c4d6e8575ca4904d7d5ea6e33a0f4ad3824

data/README.md

@@ -5,11 +5,15 @@ a Hostgroup set.
 
 ## Installation
 
-Usual Rails Engine installation - add to your Gemfile:
+See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
+for how to install Foreman plugins
 
-    gem 'foreman_default_hostgroup', :git => 'https://github.com/GregSutcliffe/foreman_default_hostgroup'
+## Compatibility
 
-then run `bundle update` and restart Foreman
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| <= 1.2          | 0.1.0          |
+| >= 1.3          | 1.0.0          |
 
 ## Usage
 
@@ -17,8 +21,8 @@ Go to `Settings -> DefaultHostgroup` and enter the name of the default
 hostgroup. Leaving this blank disables the plugin. Nested Hostgroups should be
 specified with the full label, e.g. `Base/Level1/Level2`
 
-Once set, any upload to `/fact_values/create` for a Host with no Hostgroup set
-will cause the Hostgroup to be set to the value in the Settings. THis happens
+Once set, any fact upload to `/api/hosts/facts` for a Host with no Hostgroup set
+will cause the Hostgroup to be set to the value in the Settings. This happens
 *before* the ENC data is downloaded, meaning it applies for a Host's very first
 run.
 
@@ -28,7 +32,6 @@ reports (i.e new Hosts only).
 ## TODO
 
 * Tests
-* Rewrite this in a less hacky way
 
 ## Contributing
 

data/lib/default_hostgroup_managed_host_patch.rb

@@ -10,36 +10,17 @@ module DefaultHostgroupManagedHostPatch
   end
 
   module ClassMethods
-    def importHostAndFacts_with_apply_hostgroup yaml
-      orig_result = importHostAndFacts_without_apply_hostgroup(yaml)
+    def importHostAndFacts_with_apply_hostgroup hostname, facts, certname = nil
+      host, result = importHostAndFacts_without_apply_hostgroup(hostname, facts, certname)
       Rails.logger.debug "DefaultHostgroup: performing Hostgroup check"
-      # The aliased method just returns true/false so we have to reparse the yaml
-      # to find the host
-      unless Setting[:default_hostgroup] == ''
-        facts = YAML::load yaml
-        case facts
-          when Puppet::Node::Facts
-            certname = facts.name
-            name     = facts.values["fqdn"].downcase
-          when Hash
-            certname = facts["clientcert"] || facts["certname"]
-            name     = facts["fqdn"].downcase
-        end
-        h=nil
-        if name == certname or certname.nil?
-          h = Host.find_by_name name
-        else
-          h = Host.find_by_certname certname
-          h ||= Host.find_by_name name
-        end
-        # Now we can update it
-        if h.hostgroup.nil? and h.reports.empty?
-          h.hostgroup = Hostgroup.find_by_label(Setting[:default_hostgroup])
-          h.save
-          Rails.logger.debug "DefaultHostgroup: added #{h.name} to #{h.hostgroup.label}"
-        end
+      # host.new_record? will only test for the early return in the core method, a real host
+      # will have already been saved at least once.
+      if host.present? && !host.new_record? && host.hostgroup.nil? && host.reports.empty?
+        host.hostgroup = Hostgroup.find_by_label(Setting[:default_hostgroup])
+        host.save(:validate => false)
+        Rails.logger.debug "DefaultHostgroup: added #{host.name} to #{host.hostgroup.label}"
       end
-      orig_result
+      return host, result
     end
   end
 end

data/lib/foreman_default_hostgroup/engine.rb

@@ -1,4 +1,3 @@
-require 'deface'
 require 'default_hostgroup_managed_host_patch'
 
 module ForemanDefaultHostgroup

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-10-04 00:00:00.000000000 Z
+dependencies: []
 description: Adds the option to specify a default hostgroup for new hosts created
   from facts/reports
 email: gsutclif@redhat.com