foreman_setup 5.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 490654bc557051d61752f5245a69a2c2d3b0c077
-  data.tar.gz: d5ba8f8ba082ecc4f10ed8f09229bd8e7b59b1f3
+SHA256:
+  metadata.gz: 2407b32f2eb94aec483e5d5196aac524e9295c73685dbcd1a4a98ce44a306fd4
+  data.tar.gz: 4a9c513318c239c3d4ee377f0cc69cdbc0fd61218d553a07962af516e49966c9
 SHA512:
-  metadata.gz: bb3856fb4f5da2a16cc77dbc21d1fc8d46d2357d95880b6917aaa21f0190b2c0f52b44d9251556eefc66d852aa94dae89a9b7e1b376230e4579fb8723d00d353
-  data.tar.gz: cf09e5f85600f03e33e578c5471f7049dc75cefb3f5d706f46575d95df3092789e581d0e8d245e1f7958b4c0b8294afde01654d8bb1d14b21e86969443386df8
+  metadata.gz: fc0c726ae42f5ed7bded2bf25ba053d299721c1359cdd1d66a85c1a9c48b5e04edd13984078eef6f52c9581c09b08f93fbd915313b316d92626872b5150a87c9
+  data.tar.gz: d8ab9d4e1ef58874c37217310481e9baccfd331b5b73dd2c246edb1b06b883b3f92916e098f7ee45625196ff303fc0c343fbd89139468edae07a6e9b7dcbb00b

data/CHANGES.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v8.0.0
+* release for Foreman 3.2 or newer
+
+## v7.0.0
+* release for Foreman 1.22 or newer
+
+## v6.0.0
+* fix Foreman 1.17 compatibility with Rails 5
+
 ## v5.0.1
 * use case-insensitive OS family comparisons
 * change Katello installer commands

data/README.md

@@ -25,6 +25,9 @@ RPM users can install the "tfm-rubygem-foreman_setup" or
 | >= 1.9          | ~> 3.0         |
 | >= 1.12         | ~> 4.0         |
 | >= 1.13         | ~> 5.0         |
+| >= 1.17         | ~> 6.0         |
+| >= 1.22         | ~> 7.0         |
+| >= 3.2          | ~> 8.0         |
 
 # Areas this should help
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -7,8 +7,8 @@ module ForemanSetup
     include Foreman::Controller::Parameters::Subnet
     include Foreman::Renderer
 
-    before_filter :find_myself, :only => [:new, :create]
-    before_filter :find_resource, :except => [:index, :new, :create]
+    before_action :find_myself, :only => [:new, :create]
+    before_action :find_resource, :except => [:index, :new, :create]
 
     def index
       @provisioners = Provisioner.all.paginate :page => params[:page]
@@ -58,7 +58,7 @@ module ForemanSetup
       @provisioner.domain = Domain.find_by_name(domain_name)
       @provisioner.domain ||= Domain.new(:name => domain_name)
 
-      if @provisioner.update_attributes(provisioner_params)
+      if @provisioner.update(provisioner_params)
         @provisioner.subnet.domains << @provisioner.domain unless @provisioner.subnet.domains.include? @provisioner.domain
         process_success :success_msg => _("Successfully updated subnet %s.") % @provisioner.subnet.name, :success_redirect => step3_foreman_setup_provisioner_path
       else
@@ -96,7 +96,7 @@ module ForemanSetup
       url.save!
 
       # Build default PXE menu
-      status, msg = ProvisioningTemplate.build_pxe_default(self)
+      status, msg = ProvisioningTemplate.build_pxe_default
       warning msg unless status == 200
 
       @provisioner.hostgroup.medium ||= @provisioner.host.os.media.first
@@ -105,7 +105,7 @@ module ForemanSetup
 
     def step4_update
       medium_id = params['foreman_setup_provisioner']['hostgroup_attributes'].try(:[], 'medium_id')
-      if medium_id.to_i > 0
+      if medium_id.to_i.positive?
         @medium = Medium.find(medium_id) || raise('unable to find medium')
       else
         @provisioner.hostgroup.medium_id = nil
@@ -121,7 +121,7 @@ module ForemanSetup
       end
 
       # Associate templates with OS and vice-versa
-      if @provisioner.host.os.family && @provisioner.host.os.family.casecmp('Redhat').zero?
+      if @provisioner.host.os.family&.casecmp('Redhat')&.zero?
         tmpl_name = 'Kickstart'
         provision_tmpl_name = @provisioner.host.os.name.casecmp('Redhat').zero? ? 'Kickstart RHEL' : tmpl_name
         ipxe_tmpl_name = 'Kickstart'
@@ -135,6 +135,7 @@ module ForemanSetup
 
       {'provision' => provision_tmpl_name, 'PXELinux' => tmpl_name, 'iPXE' => ipxe_tmpl_name, 'finish' => finish_tmpl_name}.each do |kind_name, tmpl_name|
         next if tmpl_name.blank?
+
         kind = TemplateKind.find_by_name(kind_name)
         tmpls = ProvisioningTemplate.where('name LIKE ?', "#{tmpl_name}%").where(:template_kind_id => kind.id)
         tmpls.any? || raise("cannot find template for #{@provisioner.host.os}")

data/app/helpers/foreman_setup/provisioner_helper.rb

@@ -3,11 +3,11 @@ module ForemanSetup
     def provisioner_wizard(step)
       wizard_header(
         step,
-         _("Pre-requisites"),
-         _("Network config"),
-         _("Foreman installer"),
-         _("Installation media"),
-         _("Completion") 
+        _("Pre-requisites"),
+        _("Network config"),
+        _("Foreman installer"),
+        _("Installation media"),
+        _("Completion")
       )
     end
   end

data/app/models/foreman_setup/provisioner.rb

@@ -1,9 +1,8 @@
 require 'ipaddr'
 
 module ForemanSetup
-  class Provisioner < ActiveRecord::Base
+  class Provisioner < ApplicationRecord
     include ::Authorizable
-    include ::Host::Hostmix
 
     before_save :populate_hostgroup
 
@@ -65,6 +64,7 @@ module ForemanSetup
     # Ensures our nested hostgroup has as much data as possible
     def populate_hostgroup
       return unless hostgroup.present?
+
       hostgroup.architecture_id ||= architecture.id
       hostgroup.domain_id ||= domain.id
       hostgroup.operatingsystem_id ||= operatingsystem.id

data/app/views/foreman_setup/provisioners/_step3.html.erb

@@ -26,9 +26,8 @@ foreman-installer \
   --foreman-proxy-dns-reverse=<%= provisioner.rdns_zone %> \
 <%= provisioner.dns_forwarders.map { |f| "  --foreman-proxy-dns-forwarders=#{f} \\" }.join("\n") %>
 <% if defined? Katello %>
-  --foreman-proxy-parent-fqdn=<%= Setting[:foreman_url] %> \
-  --foreman-proxy-foreman-oauth-key=<%= Setting[:oauth_consumer_key] %> \
-  --foreman-proxy-foreman-oauth-secret=<%= Setting[:oauth_consumer_secret] %>
+  --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \
+  --foreman-proxy-oauth-consumer-secret=<%= Setting[:oauth_consumer_secret] %>
 <% else %>
   --foreman-proxy-foreman-base-url=<%= Setting[:foreman_url] %> \
   --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \
@@ -50,9 +49,8 @@ foreman-installer \
   --foreman-proxy-dns-reverse=<%= provisioner.rdns_zone %> \
 <%= provisioner.dns_forwarders.map { |f| "  --foreman-proxy-dns-forwarders=#{f} \\" }.join("\n") %>
 <% if defined? Katello %>
-  --foreman-proxy-parent-fqdn=<%= Setting[:foreman_url] %> \
-  --foreman-proxy-foreman-oauth-key=<%= Setting[:oauth_consumer_key] %> \
-  --foreman-proxy-foreman-oauth-secret=<%= Setting[:oauth_consumer_secret] %>
+  --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \
+  --foreman-proxy-oauth-consumer-secret=<%= Setting[:oauth_consumer_secret] %>
 <% else %>
   --foreman-proxy-foreman-base-url=<%= Setting[:foreman_url] %> \
   --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \

data/db/migrate/20131023140100_add_provisioners.rb

@@ -1,4 +1,4 @@
-class AddProvisioners < ActiveRecord::Migration
+class AddProvisioners < ActiveRecord::Migration[4.2]
   def change
     create_table :setup_provisioners do |t|
       t.integer :host_id

data/db/migrate/20131025180600_add_provisioners_hostgroup.rb

@@ -1,4 +1,4 @@
-class AddProvisionersHostgroup < ActiveRecord::Migration
+class AddProvisionersHostgroup < ActiveRecord::Migration[4.2]
   def change
     add_column :setup_provisioners, :hostgroup_id, :integer
   end

data/db/migrate/20131028161000_add_provisioners_domain.rb

@@ -1,4 +1,4 @@
-class AddProvisionersDomain < ActiveRecord::Migration
+class AddProvisionersDomain < ActiveRecord::Migration[4.2]
   def change
     add_column :setup_provisioners, :domain_id, :integer
   end

data/db/migrate/20140305165000_update_foreman_setup_permissions.rb

@@ -1,4 +1,4 @@
-class UpdateForemanSetupPermissions < ActiveRecord::Migration
+class UpdateForemanSetupPermissions < ActiveRecord::Migration[4.2]
   def self.up
     old_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => nil).first
     new_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => "ForemanSetup::Provisioner").first

data/lib/foreman_setup/engine.rb

@@ -16,7 +16,7 @@ module ForemanSetup
 
     initializer 'foreman_setup.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_setup do
-        requires_foreman '>= 1.13.0'
+        requires_foreman '>= 1.22.0'
 
         menu :top_menu, :provisioners, :url_hash => {:controller=> :'foreman_setup/provisioners', :action=>:index},
                  :caption=> N_('Provisioning setup'),

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '5.0.1'
+  VERSION = '8.0.0'
 end

data/locale/ca/foreman_setup.po

@@ -3,14 +3,15 @@
 # This file is distributed under the same license as foreman_setup.
 # 
 # Translators:
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-12-08 12:35+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"PO-Revision-Date: 2017-12-12 12:40+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgid ""
 "All of the necessary components have been set up for provisioning support.  "
 "You can now provision new hosts by registering them from the Hosts page, "
 "then PXE-boot the server on the subnet set up earlier."
-msgstr "Tots els components necessaris han estat preparats per a la compatibilitat amb l'aprovisionament. Ara podeu aprovisionar els nous amfitrions tot registrant-los a la pàgina «Amfitrions», després arranqueu el servidor per PXE en la subxarxa per configurar-ho més ràpid."
+msgstr "Tots els components necessaris han estat preparats per a la compatibilitat amb l'aprovisionament. Ara podeu aprovisionar els amfitrions nous tot registrant-los a la pàgina «Amfitrions», després arranqueu el servidor per PXE en la subxarxa per configurar-ho més ràpid."
 
 msgid ""
 "All of the necessary network information has been collected, now run the "
@@ -46,10 +47,10 @@ msgid "Compute Resources"
 msgstr "Recursos computacionals"
 
 msgid "Create and provision a new host"
-msgstr "Crea i aprovisiona un nou amfitrió"
+msgstr "Crea i aprovisiona un amfitrió nou"
 
 msgid "Create new installation medium"
-msgstr "Crea un nou mitjà d'instal·lació"
+msgstr "Crea un mitjà d'instal·lació nou"
 
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
@@ -85,7 +86,7 @@ msgid ""
 "If installation media has already been set up, it can be selected below and "
 "the wizard will complete the necessary associations.  Otherwise use the "
 "fields below, or the Installation Media page in Foreman to add new media."
-msgstr "Si s'ha establert el mitjà d'instal·lació, aquest es pot seleccionar a continuació, i l'assistent completarà les associacions necessàries. En cas contrari, utilitzeu els camps de sota, o la pàgina «Mitjà d'instal·lació» a Foreman per afegir nous mitjans."
+msgstr "Si s'ha establert el mitjà d'instal·lació, aquest es pot seleccionar a continuació, i l'assistent completarà les associacions necessàries. En cas contrari, utilitzeu els camps de sota, o la pàgina «Mitjà d'instal·lació» a Foreman per afegir mitjans nous."
 
 msgid "Install provisioning with DHCP"
 msgstr "Instal·la l'aprovisionament amb DHCP"
@@ -109,7 +110,7 @@ msgid "Network selection"
 msgstr "Selecció de la xarxa"
 
 msgid "New Host"
-msgstr "Nou amfitrió"
+msgstr "Amfitrió nou"
 
 msgid "Next"
 msgstr "Següent"
@@ -142,7 +143,7 @@ msgid "Provision from %s"
 msgstr "Aprovisionament des de %s"
 
 msgid "Provisioning Setup"
-msgstr "Configuració d'aprovisionament"
+msgstr "Preparació d'aprovisionament"
 
 msgid "Provisioning host"
 msgstr "Amfitrió d'aprovisionament"
@@ -151,16 +152,16 @@ msgid "Provisioning network"
 msgstr "Xarxa d'aprovisionament"
 
 msgid "Provisioning setup"
-msgstr "Ajust d'aprovisionament"
+msgstr "Preparació d'aprovisionament"
 
 msgid "Provisioning setup complete"
-msgstr "S'ha completat la configuració de l'aprovisionament"
+msgstr "S'ha completat la preparació d'aprovisionament"
 
 msgid "Red Hat Satellite 5 or Spacewalk"
 msgstr "Red Hat Satellite 5 o Spacewalk"
 
 msgid "Return to the main provisioning setup page"
-msgstr "Torna a la pàgina principal de la configuració de l'aprovisionament"
+msgstr "Torna a la pàgina principal de la preparació d'aprovisionament"
 
 msgid "Review and edit the host group set up by the provisioning wizard"
 msgstr "Reviseu i editeu el grup d'amfitrions que s'ha configurat amb l'assistent d'aprovisionament"

data/locale/de/foreman_setup.po

@@ -7,10 +7,10 @@
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-10-08 11:29+0000\n"
+"PO-Revision-Date: 2017-09-20 10:08+0000\n"
 "Last-Translator: Christina Gurski <Gurski_christina@yahoo.de>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"

data/locale/en/foreman_setup.po

@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
 "PO-Revision-Date: 2014-08-20 09:27+0100\n"

data/locale/en_GB/foreman_setup.po

@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Andi Chandler <andi@gowling.com>, 2015
-# Dominic Cleal <dominic@cleal.org>, 2014
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-05-04 01:21+0000\n"
+"PO-Revision-Date: 2017-10-12 21:21+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"

data/locale/es/foreman_setup.po

@@ -6,11 +6,11 @@
 # Sergio Ocón <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-12-11 18:51+0000\n"
-"Last-Translator: Sergio Ocón <sergio.ocon@redhat.com>\n"
+"PO-Revision-Date: 2018-03-27 13:24+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/locale/fr/foreman_setup.po

@@ -7,10 +7,10 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2016-01-04 15:53+0000\n"
+"PO-Revision-Date: 2017-09-20 10:08+0000\n"
 "Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"

data/locale/it/foreman_setup.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
 "PO-Revision-Date: 2014-08-20 08:30+0000\n"
@@ -78,7 +78,7 @@ msgid "Host %s has at least one network interface"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "Nome host"
 
 msgid ""
 "If installation media has already been set up, it can be selected below and "
@@ -111,7 +111,7 @@ msgid "New Host"
 msgstr "Nuovo Host"
 
 msgid "Next"
-msgstr ""
+msgstr "Successivo"
 
 msgid "Next steps"
 msgstr ""

data/locale/ja/foreman_setup.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as foreman_setup.
 # 
 # Translators:
-# Shuji Yamada <uzy.exe@gmail.com>, 2015
+# 山田 修司 🍣 Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-03-25 15:12+0000\n"
-"Last-Translator: Shuji Yamada <uzy.exe@gmail.com>\n"
+"PO-Revision-Date: 2018-03-27 14:09+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/locale/ko/foreman_setup.po

@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-01-21 10:56+0000\n"
-"Last-Translator: Dominic Cleal <dominic@cleal.org>\n"
+"PO-Revision-Date: 2018-01-05 19:26+0000\n"
+"Last-Translator: 0868a4d1af5275b3f70b0a6dac4c99a4\n"
 "Language-Team: Korean (http://www.transifex.com/foreman/foreman/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgid "Host %s has at least one network interface"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "호스트 이름 "
 
 msgid ""
 "If installation media has already been set up, it can be selected below and "
@@ -111,7 +111,7 @@ msgid "New Host"
 msgstr "새 호스트"
 
 msgid "Next"
-msgstr ""
+msgstr "다음"
 
 msgid "Next steps"
 msgstr ""

data/locale/pt_BR/foreman_setup.po

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as foreman_setup.
 # 
 # Translators:
-# luizvasconcelos <luizvasconceloss@yahoo.com.br>, 2015
-# Odilhao <odilon.junior93@gmail.com>, 2015
+# Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2016
+# Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2015
+# Odilon Junior <odilon.junior93@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-10-08 11:29+0000\n"
-"Last-Translator: Odilhao <odilon.junior93@gmail.com>\n"
+"PO-Revision-Date: 2019-03-18 15:24+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgid ""
 msgstr ""
 
 msgid "Completion"
-msgstr ""
+msgstr "Conclusão"
 
 msgid "Compute Resources"
 msgstr "Recursos de computação"
@@ -80,7 +81,7 @@ msgid "Host %s has at least one network interface"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "Nome de máquina"
 
 msgid ""
 "If installation media has already been set up, it can be selected below and "

data/locale/ru/foreman_setup.po

@@ -6,10 +6,10 @@
 # Vladimir Pavlov <v.pavlov@i-teco.ru>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-07-03 10:51+0000\n"
+"PO-Revision-Date: 2017-12-01 20:58+0000\n"
 "Last-Translator: Vladimir Pavlov <v.pavlov@i-teco.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)\n"
 "MIME-Version: 1.0\n"

data/locale/sv_SE/foreman_setup.po

@@ -6,10 +6,10 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2015-01-21 10:56+0000\n"
+"PO-Revision-Date: 2017-09-20 10:08+0000\n"
 "Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"

data/locale/zh_CN/foreman_setup.po

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as foreman_setup.
 # 
 # Translators:
+# Xingchao Yu <yuxcer@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2014-08-20 08:30+0000\n"
-"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
+"PO-Revision-Date: 2017-12-01 20:58+0000\n"
+"Last-Translator: Xingchao Yu <yuxcer@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +61,7 @@ msgid "Domain|Name"
 msgstr "名称"
 
 msgid "Edit Host Group"
-msgstr ""
+msgstr "编辑主机组"
 
 msgid "Existing medium"
 msgstr ""
@@ -78,7 +79,7 @@ msgid "Host %s has at least one network interface"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "主机名"
 
 msgid ""
 "If installation media has already been set up, it can be selected below and "
@@ -102,7 +103,7 @@ msgid "Missing registered smart proxy %s, please ensure it is registered"
 msgstr ""
 
 msgid "Network config"
-msgstr ""
+msgstr "网络配置"
 
 msgid "Network selection"
 msgstr ""
@@ -111,10 +112,10 @@ msgid "New Host"
 msgstr "新建主机"
 
 msgid "Next"
-msgstr ""
+msgstr "下一项"
 
 msgid "Next steps"
-msgstr ""
+msgstr "下一步"
 
 msgid "No network interfaces listed in $interfaces fact"
 msgstr ""

data/locale/zh_TW/foreman_setup.po

@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_setup 3.0.2\n"
+"Project-Id-Version: foreman_setup 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 09:25+0100\n"
-"PO-Revision-Date: 2014-08-20 08:30+0000\n"
-"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
+"PO-Revision-Date: 2018-03-27 15:20+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgid "Host %s has at least one network interface"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "主機名稱"
 
 msgid ""
 "If installation media has already been set up, it can be selected below and "
@@ -111,7 +111,7 @@ msgid "New Host"
 msgstr "新增主機"
 
 msgid "Next"
-msgstr ""
+msgstr "下一個"
 
 msgid "Next steps"
 msgstr ""

data/test/factories/provisioners.rb

@@ -1,25 +1,25 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :setup_provisioner, :class => ForemanSetup::Provisioner do
     host do
-      association :host, :with_puppet_orchestration, :domain => FactoryGirl.create(:domain)
+      association :host, :managed, :domain => FactoryBot.create(:domain)
     end
     smart_proxy { association :smart_proxy, :url => "https://#{host.name}:8443" }
 
     # After step1, interface selection
     trait :step1 do
-      provision_interface 'eth0'
+      provision_interface { 'eth0' }
       after(:create) do |prov, evaluator|
-        fact = FactoryGirl.create(:fact_name, :name => "ipaddress_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.20')
+        fact = FactoryBot.create(:fact_name, :name => "ipaddress_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.20')
 
-        fact = FactoryGirl.create(:fact_name, :name => "network_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.0')
+        fact = FactoryBot.create(:fact_name, :name => "network_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.0')
 
-        fact = FactoryGirl.create(:fact_name, :name => "netmask_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '255.255.255.0')
+        fact = FactoryBot.create(:fact_name, :name => "netmask_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '255.255.255.0')
 
-        fact = FactoryGirl.create(:fact_name, :name => 'interfaces')
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => 'lo,eth0,eth1')
+        fact = FactoryBot.create(:fact_name, :name => 'interfaces')
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => 'lo,eth0,eth1')
       end
     end
 

data/test/functional/foreman_setup/provisioners_controller_test.rb

@@ -2,26 +2,26 @@ require 'test_plugin_helper'
 
 class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   test '#index without provisioner' do
-    get :index, {}, set_session_user
+    get :index, session: set_session_user
     assert_redirected_to new_foreman_setup_provisioner_path
   end
 
   test '#index with provisioner' do
-    FactoryGirl.create :setup_provisioner
-    get :index, {}, set_session_user
+    FactoryBot.create :setup_provisioner
+    get :index, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/index'
   end
 
   context 'pre-creation' do
     setup do
-      @host = FactoryGirl.create(:host, :domain => FactoryGirl.create(:domain))
+      @host = FactoryBot.create(:host, :domain => FactoryBot.create(:domain))
       Facter.expects(:value).with(:fqdn).returns(@host.name).at_least_once
-      @proxy = FactoryGirl.create(:smart_proxy, :url => "https://#{@host.name}:8443")
+      @proxy = FactoryBot.create(:smart_proxy, :url => "https://#{@host.name}:8443")
     end
 
     test '#new' do
-      get :new, {}, set_session_user
+      get :new, session: set_session_user
       assert_response :success
       assert_equal @host, assigns(:host)
       assert_equal @proxy, assigns(:proxy)
@@ -29,7 +29,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
     end
 
     test '#create success' do
-      post :create, {'foreman_setup_provisioner' => {:host_id => @host.id, :smart_proxy_id => @proxy.id, :provision_interface => 'eth0'}}, set_session_user
+      post :create, params: { 'foreman_setup_provisioner' => {:host_id => @host.id, :smart_proxy_id => @proxy.id, :provision_interface => 'eth0'} }, session: set_session_user
 
       prov = ForemanSetup::Provisioner.find_by_host_id(@host.id)
       assert prov
@@ -43,7 +43,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
     end
 
     test '#create failure' do
-      post :create, {}, set_session_user
+      post :create, session: set_session_user
       assert_equal @host, assigns(:host)
       assert_equal @proxy, assigns(:proxy)
       assert_template 'foreman_setup/provisioners/_step1'
@@ -51,8 +51,8 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step2 with new subnet' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
-    get :step2, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step1)
+    get :step2, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step2'
 
@@ -65,10 +65,10 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step2_update' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     Facter.expects(:value).with(:fqdn).returns(prov.host.name).at_least_once
 
-    put :step2_update, {:id => prov.id, 'foreman_setup_provisioner' => {:subnet_attributes => {'name' => 'test', :network => '192.168.1.0', :mask => '255.255.255.0'}, :domain_name => prov.host.domain.name}}, set_session_user
+    put :step2_update, params: { :id => prov.id, 'foreman_setup_provisioner' => {:subnet_attributes => {'name' => 'test', :network => '192.168.1.0', :mask => '255.255.255.0'}, :domain_name => prov.host.domain.name} }, session: set_session_user
     assert_redirected_to step3_foreman_setup_provisioner_path(prov)
 
     as_admin do
@@ -93,14 +93,14 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step3' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
-    get :step3, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step2)
+    get :step3, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step3'
   end
 
   test '#step4' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
+    prov = FactoryBot.create(:setup_provisioner, :step2)
 
     SmartProxy.any_instance.expects(:refresh)
     prov.smart_proxy.features = Feature.where(:name => ['DNS', 'DHCP', 'TFTP'])
@@ -108,7 +108,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
 
     ProvisioningTemplate.expects(:build_pxe_default).returns(200, 'Sucess')
 
-    get :step4, {:id => prov.id}, set_session_user
+    get :step4, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step4'
     assert assigns(:medium)
@@ -125,13 +125,13 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step4_update' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
+    prov = FactoryBot.create(:setup_provisioner, :step2)
 
     attrs = {
       :hostgroup_attributes => {},
       :create_medium => {:name => 'test', :path => 'http://mirror.example.com'},
     }
-    put :step4_update, {:id => prov.id, 'foreman_setup_provisioner' => attrs}, set_session_user
+    put :step4_update, params: { :id => prov.id, 'foreman_setup_provisioner' => attrs }, session: set_session_user
     assert_redirected_to step5_foreman_setup_provisioner_path(prov)
 
     as_admin do
@@ -148,8 +148,8 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step5' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
-    get :step5, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step2)
+    get :step5, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step5'
   end

data/test/test_plugin_helper.rb

@@ -1,6 +1,6 @@
 # This calls the main test_helper in Foreman core
 require 'test_helper'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload

data/test/unit/foreman_setup/provisioner_test.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 
 class ForemanSetupProvisionerTest < ActiveSupport::TestCase
   test '#interfaces returns hash' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     assert_equal({'eth0' => {:ip => '192.168.1.20', :mask => '255.255.255.0', :network => '192.168.1.0', :cidr => '192.168.1.0/24'}}, prov.interfaces)
   end
 
   test '#provision_interface_data returns hash' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     assert_equal({:ip => '192.168.1.20', :mask => '255.255.255.0', :network => '192.168.1.0', :cidr => '192.168.1.0/24'}, prov.provision_interface_data)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Dominic Cleal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that helps set up provisioning.
 email: dcleal@redhat.com
@@ -81,11 +81,11 @@ files:
 - test/functional/foreman_setup/provisioners_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_setup/provisioner_test.rb
-homepage: http://github.com/theforeman/foreman_setup
+homepage: https://github.com/theforeman/foreman_setup
 licenses:
 - GPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Helps set up Foreman for provisioning
 test_files: []