foreman_chef 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92676c4caa608850b55c0663e13df92cc848793
-  data.tar.gz: a98cd1ada786665546e6ff3113e82238fb55773d
+  metadata.gz: b773fa035adf626fde30885aee0bef06f0d4ba46
+  data.tar.gz: 38d3baf59f382e1a26ccd24485b0bdb30a409cea
 SHA512:
-  metadata.gz: 97bb1712a25daa936b3833c44ab3b747dd9ea7e1c73b381234bc11d79c523e0dda6024a54ea91d5b0740ecf037de0e67f8d66e48273dee4ee07f50c61e60a785
-  data.tar.gz: fec31d07933b0cf391fff92662b07ef2ab272c0d2d4f83735e2b2e9f87d47ff400f99797621fa67ebb7150aa0edc4c12b8f5164ed90e7b9db5c32f7790f7238a
+  metadata.gz: c555e4843a61e3b7d2ed2425b2697a39407fce06bebe8d208cd0c24e9986181c8460a50a241ca961c888c7441e4af4648af4cb34a56d8891d3ebdfecb19de7fc
+  data.tar.gz: 13c080d9e7980bb11f134d102f975f51169ce4663d21d5b9662e0f8334652398a551bd188fd3f52b80234d7187e88b5b686f8f59dec528fa8e123afc4cce8eb9

data/app/models/foreman_chef/fact_importer.rb

@@ -1,5 +1,7 @@
 module ForemanChef
   class FactImporter < ::FactImporter
+    class FactNameImportError < StandardError; end
+
     def fact_name_class
       ForemanChef::FactName
     end
@@ -18,7 +20,7 @@ module ForemanChef
 
     def add_new_facts
       @counters[:added] = 0
-      add_missing_facts(unsparse(original_facts))
+      add_missing_facts(Sparser.new.unsparse(original_facts))
       logger.debug("Merging facts for '#{host}': added #{@counters[:added]} facts")
     end
 
@@ -30,9 +32,21 @@ module ForemanChef
         if fact_names[name_with_prefix].present?
           fact_name_id = fact_names[name_with_prefix]
         else
-          fact_name_id = fact_name_class.create!(:name      => name_with_prefix,
-                                                 :parent_id => parent,
-                                                 :compose   => compose).id
+          # fact names didn't contain fact_name so we create new one
+          fact_name = fact_name_class.new(:name      => name_with_prefix,
+                                          :parent_id => parent,
+                                          :compose   => compose)
+          if fact_name.save
+            fact_name_id = fact_name.id
+          elsif fact_name.errors[:name].present?
+            # saving could have failed because of raise condition with another import process,
+            # so if the error is on name uniqueness, we try to reload conflicting name and use it
+            conflicting_fact_name = fact_name_class.where(:name => fact_name.name).first
+            fact_name_id = conflicting_fact_name.id
+          else
+            raise FactNameImportError, "unable to save fact name, errors: #{fact_name.errors.full_messages.join("\n")}"
+          end
+          fact_name_id
         end
 
         if compose
@@ -89,23 +103,25 @@ module ForemanChef
       hash.sort_by { |k, v| k.to_s }
     end
 
-    def sparse(hash, options={})
-      hash.map do |k, v|
-        prefix = (options.fetch(:prefix, [])+[k])
-        next Sparsify::sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
-        { prefix.join(options.fetch(:separator, FactName::SEPARATOR)) => v }
-      end.reduce(:merge) || Hash.new
-    end
+    class Sparser
+      def sparse(hash, options={})
+        hash.map do |k, v|
+          prefix = (options.fetch(:prefix, [])+[k])
+          next sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
+          { prefix.join(options.fetch(:separator, FactName::SEPARATOR)) => v }
+        end.reduce(:merge) || Hash.new
+      end
 
-    def unsparse(hash, options={})
-      ret = Hash.new
-      sparse(hash).each do |k, v|
-        current            = ret
-        key                = k.to_s.split(options.fetch(:separator, FactName::SEPARATOR))
-        current            = (current[key.shift] ||= Hash.new) until (key.size<=1)
-        current[key.first] = v
+      def unsparse(hash, options={})
+        ret = Hash.new
+        sparse(hash).each do |k, v|
+          current            = ret
+          key                = k.to_s.split(options.fetch(:separator, FactName::SEPARATOR))
+          current            = (current[key.shift] ||= Hash.new) until (key.size<=1)
+          current[key.first] = v
+        end
+        return ret
       end
-      return ret
     end
   end
 end

data/app/models/foreman_chef/fact_parser.rb

@@ -0,0 +1,122 @@
+module ForemanChef
+  class FactParser < ::FactParser
+    VIRTUAL = /\A([a-z0-9]+)[:.](\d+)\Z/
+    VIRTUAL_NAMES = /#{VIRTUAL}|#{BRIDGES}|#{BONDS}/
+
+    def operatingsystem
+      os_name = facts['lsb::id'] || facts['platform']
+      release = facts['lsb::release'] || fact['platform_version']
+      major, minor = release.split('.')
+      description = facts['lsb::description']
+      release_name = facts['lsb::codename']
+
+      begin
+        klass = os_name.constantize
+      rescue NameError => e
+        logger.debug "unknown operating system #{os_name}, fallback to generic type"
+        klass = Operatingsystem
+      end
+
+      args = { :name => os_name, :major => major, :minor => minor }
+      klass.where(args).first || klass.new(args.merge(:description => description, :release_name => release_name)).save!
+    end
+
+    def environment
+      name = facts['environment'] || Setting[:default_puppet_environment]
+      Environment.find_or_create_by_name name
+    end
+
+    def architecture
+      name = facts['kernel::machine']
+      name = "x86_64" if name == "amd64"
+      Architecture.find_or_create_by_name name unless name.blank?
+    end
+
+    def model
+      if facts['virtualization'].present?
+        name = facts['virtualization']['system']
+      else
+        name = facts['dmi::system::product_name']
+      end
+      Model.find_or_create_by_name(name.strip) unless name.blank?
+    end
+
+    def domain
+      name = facts['domain']
+      Domain.find_or_create_by_name name unless name.blank?
+    end
+
+    def ipmi_interface
+      if facts['ipmi::mac_address'].present?
+        { 'ipaddress' => facts['ipmi::address'], 'macaddress' => facts['ipmi::mac_address'] }.with_indifferent_access
+      end
+    end
+
+    def certname
+      facts['chef_node_name']
+    end
+
+    def support_interfaces_parsing?
+      true
+    end
+
+    def parse_interfaces?
+      support_interfaces_parsing? && !Setting['ignore_puppet_facts_for_provisioning']
+    end
+
+    private
+
+    # meant to be implemented in inheriting classes
+    # should return hash with indifferent access in following format:
+    # { 'link': 'true',
+    #   'macaddress': '00:00:00:00:00:FF',
+    #   'ipaddress': nil,
+    #   'any_other_fact': 'value' }
+    #
+    # note that link and macaddress are mandatory
+    def get_facts_for_interface(interface)
+      facts = interfaces_hash[interface]
+      hash = {
+        'link' => facts['state'] == 'up',
+        'macaddress' => get_address_by_family(facts['addresses'], 'lladdr'),
+        'ipaddress' => get_address_by_family(facts['addresses'], 'inet'),
+      }
+      hash['tag'] = facts['vlan']['id'] if facts['vlan'].present?
+      hash.with_indifferent_access
+    end
+
+    # meant to be implemented in inheriting classes
+    # should return array of interfaces names, e.g.
+    #   ['eth0', 'eth0.0', 'eth1']
+    def get_interfaces
+      interfaces_hash.keys
+    end
+
+    def get_address_by_family(addresses, family)
+      addresses.detect { |address, attributes| attributes['family'] == family }.try(:first)
+    end
+
+    def network_hash
+      @network_hash ||= ForemanChef::FactImporter::Sparser.new.unsparse(facts.select { |k, v| k =~ /\Anetwork::interfaces::/})['network']
+    end
+
+    def interfaces_hash
+      @interfaces_hash ||= network_hash['interfaces']
+    end
+
+    # adds attributes like virtual
+    def set_additional_attributes(attributes, name)
+      if name =~ VIRTUAL_NAMES
+        attributes[:virtual] = true
+        if $1.nil? && name =~ BRIDGES
+          attributes[:bridge] = true
+        else
+          attributes[:attached_to] = $1
+        end
+      else
+        attributes[:virtual] = false
+      end
+      attributes
+    end
+  end
+end

data/app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb

@@ -8,12 +8,22 @@ cat << 'EOF' > /etc/chef/validation.pem
 <%= @host.params['chef_validation_private_key'] %>
 EOF
 
+## If chef_server_certificate is present, install it into /etc/chef/trusted_certs
+<% chef_server_certificate = @host.params['chef_server_certificate'] -%>
+<% if !chef_server_certificate.nil? && !chef_server_certificate.empty? -%>
+mkdir -p /etc/chef/trusted_certs
+chmod 0755 /etc/chef/trusted_certs
+cat << 'EOF' > /etc/chef/trusted_certs/chef-server.pem
+<%= chef_server_certificate %>
+EOF
+<% end -%>
+
 echo "Configuring chef client.rb"
 cat << 'EOF' > /etc/chef/client.rb
 log_level        :info
 log_location     STDOUT
 chef_server_url  "<%= @host.params['chef_server_url'] %>"
-validation_client_name "chef-validator"
+validation_client_name "<%= @host.params['chef_validator_name'] -%>"
 file_backup_path   "/var/lib/chef"
 file_cache_path    "/var/cache/chef"
 pid_file           "/var/run/chef/client.pid"

data/db/seeds.rb

@@ -21,6 +21,7 @@ parameters = [
   { :name => 'chef_validation_private_key', :value => 'UNSPECIFIED, you must upload your validation key here' },
   { :name => 'chef_bootstrap_template', :value => 'chef-client omnibus bootstrap' },
   { :name => 'chef_server_certificate', :value => '' },
+  { :name => 'chef_validator_name', :value => 'chef-validator' },
 ]
 
 parameters.each do |parameter|

data/lib/foreman_chef/engine.rb

@@ -47,6 +47,7 @@ module ForemanChef
       ::Hostgroup.send :include, ChefProxyAssociation
       ::SmartProxy.send :include, SmartProxyExtensions
       ::FactImporter.register_fact_importer(:foreman_chef, ForemanChef::FactImporter)
+      ::FactParser.register_fact_importer(:foreman_chef, ForemanChef::FactParser)
       ::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
     end
 

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - app/overrides/add_chef_proxy.rb
 - app/helpers/foreman_chef/chef_proxy_form.rb
+- app/models/foreman_chef/fact_parser.rb
 - app/models/foreman_chef/fact_name.rb
 - app/models/foreman_chef/smart_proxy_extensions.rb
 - app/models/foreman_chef/chef_proxy_association.rb