foreman_discovery 19.0.5 → 20.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d82b5ffe2a3ca76a0696ae862c4f6108a9728e6547f45884a63f8f9786bd87e
-  data.tar.gz: 3dc9931563de9407620f06d5c14c128f0409e762a3d0c55777084af31a4579ac
+  metadata.gz: 42e909e67952be309ba249d25294fa97227d9ad9dcd6c98b71f93c33e8d94e4c
+  data.tar.gz: ccf2de1a46292d285fbf187e7c65def6c7bb0c210bb1d7a26ad4b7353a967f12
 SHA512:
-  metadata.gz: 4d1603c83fb6334a36e8e43a01437581c031a63c6cafdb1ce777edb91a8a82b6716be1965bfe132cb10737a124c0a180caee4e82ee265fed13c9eb2408f792d9
-  data.tar.gz: fcb4dd77d044943b182f3e399fa3d8a08f2301a81162f9da95e7a8f52570df201a73e3a8438753dc7f96b17d2bc69226f1b3eccca3f5d224f2b4e2b6e215654e
+  metadata.gz: d8fa0da48abb3f11aac1b79b1bc7faa5ec22e9c56543a4802a789a6d626370ccd6c5daa9f5b2faeb4be92af8068d99174a299a5ac865b71de38de8c6785fc369
+  data.tar.gz: 7a832889e8509358be5c7affeed3894cf964e9c2defc29644f54c1f015f872583ab77bfeed39644c89acad6f0cd3bdb34ae4c7fe08261c971f3e631b4cc60fdc

data/app/models/concerns/discovery_taxonomy_extensions.rb

@@ -2,6 +2,6 @@ module DiscoveryTaxonomyExtensions
   extend ActiveSupport::Concern
   included do
     has_many :discovered_hosts, :class_name => 'Host::Discovered'
-    before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:discovered_hosts)
+    before_destroy EnsureNotUsedBy.new(:discovered_hosts)
   end
 end

data/app/models/setting/discovered.rb

@@ -14,8 +14,8 @@ class Setting::Discovered < ::Setting
 
   def self.default_settings
     [
-      self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[[['', '']].concat Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
-      self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[[['', '']].concat Organization.all.map{|org| [org[:title], org[:title]]}]} }),
+      self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
+      self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[Organization.all.map{|org| [org[:title], org[:title]]}]} }),
       self.set('discovery_fact', N_("Fact name to use for primary interface detection"), "discovery_bootif", N_("Interface fact")),
       self.set('discovery_auto_bond', N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"), false, N_("Create bond interfaces")),
       self.set('discovery_clean_facts', N_("Clean all reported facts during provisioning (except discovery facts)"), false, N_("Clean all facts")),

data/app/views/foreman_discovery/debian_kexec.erb

@@ -4,17 +4,18 @@ name: Discovery Debian kexec
 oses:
 - Debian
 - Ubuntu
-description: |
-  This template is used to pass command line options to kexec when reloading
-  kernel on a discovered host instead of rebooting. This is useful in PXE-less
-  environments. The template must generate JSON format with the following items
-  "kernel", "initram", "append" and "extra". The kexec command is composed in
-  the following way:
-  
-  kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-  
-  Please read kexec(8) man page for more information about semantics.
-  Extra options like --reset-vga can be set via "extra" array.
+-%>
+<%#
+This template is used to pass command line options to kexec when reloading
+kernel on a discovered host instead of rebooting. This is useful in PXE-less
+environments. The template must generate JSON format with the following items
+"kernel", "initram", "append" and "extra". The kexec command is composed in
+the following way:
+
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
+
+Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -14,17 +14,18 @@ oses:
 - RedHat 5
 - RedHat 6
 - RedHat 7
-description: |
-  This template is used to pass command line options to kexec when reloading
-  kernel on a discovered host instead of rebooting. This is useful in PXE-less
-  environments. The template must generate JSON format with the following items
-  "kernel", "initram", "append" and "extra". The kexec command is composed in
-  the following way:
-  
-  kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-  
-  Please read kexec(8) man page for more information about semantics.
-  Extra options like --reset-vga can be set via "extra" array.
+-%>
+<%#
+This template is used to pass command line options to kexec when reloading
+kernel on a discovered host instead of rebooting. This is useful in PXE-less
+environments. The template must generate JSON format with the following items
+"kernel", "initram", "append" and "extra". The kexec command is composed in
+the following way:
+
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
+
+Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']
@@ -46,9 +47,9 @@ description: |
   "initram": "<%= @initrd_uri %>",
 <% if (@host.operatingsystem.name == 'Fedora' and @host.operatingsystem.major.to_i > 16) or
     (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
-  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% else -%>
-  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% end -%>
   "extra": []
 }

data/lib/foreman_discovery/engine.rb

@@ -43,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 3.1'
+        requires_foreman '>= 3.2'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -147,7 +147,7 @@ module ForemanDiscovery
           :edit_discovery_rules,
           :destroy_discovery_rules,
         ]
-        if defined?(ForemanPuppet::Engine)
+        if defined?(ForemanPuppet::VERSION) 
           MANAGER += [ :view_environments, :view_puppetclasses ]
         end
         role "Discovery Reader", READER, "Role granting permissions to view discovered hosts"

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "19.0.5"
+  VERSION = "20.0.0"
 end