foreman_specifictemplate 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c89daabed0d9840a00c03bab26781138fff284
-  data.tar.gz: a8c92586e630eef6abb8c26b9e53fb997a9fa220
+  metadata.gz: 2070a1537aa93375ca77a16c0e96de2594bddd4b
+  data.tar.gz: 83d507a61bf420703190bc30ac07111054546579
 SHA512:
-  metadata.gz: 75414573f75af2218e99f4ac9fbbc3d6e687b20a904934515602fe47e1cfda076db6a3184b3dae739cbde6e288936b0ac6dbb61abb4266ea4acec68557523e0a
-  data.tar.gz: 2a72ea4003e421fc8f62806b8dbf712d3d10e291b53e7946c2b243ccd19aa93e81378d8b0318849730c7fa04dfcd9739f1c2ef5161c5f8d959590a7a09d0507d
+  metadata.gz: 6562231212835d63c74caca7e2591207e37b6d8cb0aa1aa3d0ae156b6af08708a048b421278c6fbb4924ae8e3889d41094b0b8f295d719203718ffd9f09c3557
+  data.tar.gz: 9f5a6192298e2c55d8243f4e2a470f6932ac4be6ef1ca6101ffd896b5f30f5692c37cb0e1a0b6d8108c14c69d59af5b5f54d5f64febcc69fdb3e6dc3fe08c324

data/app/controllers/specifictemplate_controller.rb

@@ -1,3 +1,5 @@
+require 'ipaddr'
+
 class SpecifictemplateController < ApplicationController
   # Skip default filters for specific template actions
   FILTERS = [
@@ -17,7 +19,7 @@ class SpecifictemplateController < ApplicationController
   before_action :find_host
 
   def update
-    return false unless @host and @host.build?
+    return render(:plain => 'Host not in build mode') unless @host and @host.build?
 
     # TODO? Detect PXELinux/PXEGrub/PXEGrub2/iPXE, @host.pxe_loader.split.first maybe
     # Would mean templates could be provided with 'template_name=default local boot'
@@ -27,6 +29,8 @@ class SpecifictemplateController < ApplicationController
     template = ProvisioningTemplate.find_by_name(template_name)
     raise Foreman::Exception.new(N_("Template '%s' was not found"), template_name) unless template
 
+    # TODO; Check that the template is of the correct PXE type, not just that the OS
+    # allows using that type. Don't want to deploy PXELinux on a PXEGrub2 host.
     kind = template.template_kind.name
     raise Foreman::Exception.new(N_("%s does not support templates of type %s"), @host.operatingsystem, kind) unless @host.operatingsystem.template_kinds.include?(kind)
 
@@ -38,7 +42,7 @@ class SpecifictemplateController < ApplicationController
       next unless iface.tftp? || iface.tftp6?
 
       iface.send(:unique_feasible_tftp_proxies).each do |proxy|
-        mac_addresses = iface.respond_to?(:mac_addresses_for_tftp, true) && iface.send(:mac_addresses_for_tftp) || [mac]
+        mac_addresses = iface.try(:mac_addresses_for_tftp) || [iface.mac]
         mac_addresses.each do |mac_addr|
           proxy.set(kind, mac_addr, :pxeconfig => content)
         end
@@ -107,7 +111,13 @@ class SpecifictemplateController < ApplicationController
     ip = ip.split(',').first
 
     # host is readonly because of association so we reload it if we find it
-    host = Host.joins(:provision_interface).where(:nics => { :ip => ip }).first
+    if IPAddr.new(ip).ipv6?
+      search = { :ip6 => ip }
+    else 
+      search = { :ip => ip }
+    end
+
+    host = Host.joins(:provision_interface).where(:nics => search).first
     host ? Host.find(host.id) : nil
   end
 

data/lib/foreman_specifictemplate/version.rb

@@ -1,3 +1,3 @@
 module ForemanSpecificTemplate
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_specifictemplate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexander Olofsson