foreman_setup 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25978885e7b03804a5fe61ef826dec9066c6fe1c
-  data.tar.gz: 95eb1f06b591993cfb9b96054c134c6b6b2a4ea4
+  metadata.gz: be2c21aab067c9a71805c4a61c9d79c803c01e55
+  data.tar.gz: a61f30441ef62da762a8686b848bb861f8c1a743
 SHA512:
-  metadata.gz: a82ecf10b0453cc7f83101181b29cfdbab2b5e1a220a53c240839ee96bfb3bef7c8c48db0f32ce87f2b82455c4ebe2e77961747e714360390a3a920b75e86f84
-  data.tar.gz: 780002129da83831c4c1e62800fb19854ec8b6d4a709dd616c0b4189afeb2d77761ac1058b29a828f0206966da97d493db3b4c7223a0c6465585daecfc5efd64
+  metadata.gz: 1fdc207acb0b3f85419b13cc436193376965226e30f0b008796898b8cf5000e029de48cc0a9d60036bb53d0478e4ebb47a815683053acc7b08ec07c837eac0d1
+  data.tar.gz: 29de4ecac44e3e9cc0ebe12f5e3879595b422518ddc5cd1368ab751553f6cb28325c1096d107d69f4af16fdad81b85ade4c09c05a2bb6e8b016b159cfb612882

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.0.0
+* fix Foreman 1.12 compatibility with icons, CSS, template rendering etc.
+* fix empty DHCP range in installer arguments if left blank
+* remove Spacewalk functionality
+
 ## v3.1.1
 * update DB migration limits for Rails 4.2 change
 * fix Rails 4.2 routing deprecation

data/README.md

@@ -13,7 +13,7 @@ Please see the Foreman wiki for appropriate instructions:
 The gem name is "foreman_setup".  Run `foreman-rake db:migrate` after
 installation.
 
-RPM users can install the "ruby193-rubygem-foreman_setup" or
+RPM users can install the "tfm-rubygem-foreman_setup" or
 "rubygem-foreman_setup" packages.
 
 ## Compatibility
@@ -23,6 +23,7 @@ RPM users can install the "ruby193-rubygem-foreman_setup" or
 | <= 1.4          | ~> 1.0         |
 | >= 1.5          | ~> 2.0         |
 | >= 1.9          | ~> 3.0         |
+| >= 1.12         | ~> 4.0         |
 
 # Areas this should help
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -2,6 +2,7 @@ require 'facter'
 
 module ForemanSetup
   class ProvisionersController < ::ApplicationController
+    include Foreman::Controller::ProvisioningTemplates
     include Foreman::Renderer
 
     before_filter :find_myself, :only => [:new, :create]
@@ -98,22 +99,9 @@ module ForemanSetup
 
       @provisioner.hostgroup.medium ||= @provisioner.host.os.media.first
       @medium = Medium.new(params['foreman_setup_provisioner'].try(:[], 'medium_attributes'))
-
-      parameters = @provisioner.hostgroup.group_parameters
-      @activation_key = parameters.where(:name => 'activation_key').first || parameters.new(:name => 'activation_key')
-      @satellite_type = parameters.where(:name => 'satellite_type').first || parameters.new(:name => 'satellite_type')
     end
 
     def step4_update
-      if params['medium_type'] == 'spacewalk'
-        spacewalk_hostname = params['spacewalk_hostname']
-        if spacewalk_hostname.blank?
-          @provisioner.errors.add(:base, _("Spacewalk hostname is missing"))
-          process_error :render => 'foreman_setup/provisioners/step4', :object => @provisioner, :redirect => step4_foreman_setup_provisioner_path
-          return
-        end
-      end
-
       medium_id = params['foreman_setup_provisioner']['hostgroup_attributes']['medium_id']
       if medium_id.to_i > 0
         @medium = Medium.find(medium_id) || raise('unable to find medium')
@@ -121,22 +109,6 @@ module ForemanSetup
         @provisioner.hostgroup.medium_id = nil
         @medium = Medium.new(params['foreman_setup_provisioner']['create_medium'].slice(:name, :path))
       end
-      @medium.path = "http://#{spacewalk_hostname}/ks/dist/ks-rhel-$arch-server-$major-$version" unless spacewalk_hostname.blank?
-
-      parameters = @provisioner.hostgroup.group_parameters
-      @activation_key = parameters.where(:name => 'activation_key').first
-      if @activation_key
-        @activation_key.assign_attributes(params['foreman_setup_provisioner']['activation_key'])
-      elsif params['foreman_setup_provisioner']['activation_key']['value'].present?
-        @activation_key = parameters.new(params['foreman_setup_provisioner']['activation_key'].merge(:name => 'activation_key'))
-      end
-
-      @satellite_type = parameters.where(:name => 'satellite_type').first
-      if @satellite_type
-        @satellite_type.assign_attributes(params['foreman_setup_provisioner']['satellite_type'])
-      elsif params['foreman_setup_provisioner']['satellite_type']['value'].present?
-        @satellite_type = parameters.new(params['foreman_setup_provisioner']['satellite_type'].merge(:name => 'satellite_type'))
-      end
 
       # Associate medium with the host OS
       @medium.os_family ||= @provisioner.host.os.type

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

@@ -11,24 +11,24 @@
   <div>
     <%= f.hidden_field :host_id %>
     <% if f.object.host.present? %>
-      <%= checked_icon f.object.host.present? %> <%= _("Found registered host %s") % f.object.host.name %>
+      <%= icon_text 'ok', _("Found registered host %s") % f.object.host.name, :kind => 'pficon' %>
     <% else %>
-      <%= image_tag 'foreman_setup/false.png' %> <%= _("Missing registered host %s, please ensure it is checking in") % f.object.fqdn %>
+      <%= icon_text 'error-circle-o', _("Missing registered host %s, please ensure it is checking in") % f.object.fqdn, :kind => 'pficon' %>
     <% end %>
   </div>
   <div>
     <%= f.hidden_field :smart_proxy_id %>
     <% if f.object.smart_proxy.present? %>
-      <%= checked_icon f.object.smart_proxy.present? %> <%= _("Found registered smart proxy %s") % f.object.smart_proxy.name %>
+      <%= icon_text 'ok', _("Found registered smart proxy %s") % f.object.smart_proxy.name, :kind => 'pficon' %>
     <% else %>
-      <%= image_tag 'foreman_setup/false.png' %> <%= _("Missing registered smart proxy %s, please ensure it is registered") % f.object.fqdn %>
+      <%= icon_text 'error-circle-o', _("Missing registered smart proxy %s, please ensure it is registered") % f.object.fqdn, :kind => 'pficon' %>
     <% end %>
   </div>
   <div>
     <% if f.object.host.present? && f.object.interfaces.any? %>
-      <%= checked_icon f.object.host.present? %> <%= _("Host %s has at least one network interface") % f.object.host.name %>
+      <%= icon_text 'ok', _("Host %s has at least one network interface") % f.object.host.name, :kind => 'pficon' %>
     <% else %>
-      <%= image_tag 'foreman_setup/false.png' %> <%= _("No network interfaces listed in $interfaces fact") %>
+      <%= icon_text 'error-circle-o', _("No network interfaces listed in $interfaces fact"), :kind => 'pficon' %>
     <% end %>
   </div>
 

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

@@ -23,7 +23,9 @@
   <%= parameter %>-dhcp=true \
   <%= parameter %>-dhcp-interface=<%= provisioner.provision_interface %> \
   <%= parameter %>-dhcp-gateway=<%= provisioner.subnet.gateway %> \
+<% if provisioner.subnet.from.present? && provisioner.subnet.to.present? %>
   <%= parameter %>-dhcp-range="<%= provisioner.subnet.from %> <%= provisioner.subnet.to %>" \
+<% end %>
   <%= parameter %>-dhcp-nameservers="<%= provisioner.subnet.dns_primary %><%= ("," + provisioner.subnet.dns_secondary) unless provisioner.subnet.dns_secondary.blank? %>" \
   <%= parameter %>-dns=true \
   <%= parameter %>-dns-interface=<%= provisioner.provision_interface %> \

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

@@ -28,35 +28,17 @@
 
   <h4><%= _("Operating system") %></h4>
   <p><%= _("The following operating system will be configured for provisioning:") %></p>
-  <%= (icon(f.object.host.os, :size => "18x18") + " #{f.object.host.os}").html_safe %>
+  <%= content_tag(:div, :style => 'margin-left: 20px; margin-bottom: 30px;') { (icon(f.object.host.os, :size => "18x18") + " #{f.object.host.os}").html_safe } %>
 
-  <h6><%= _("Use an existing installation medium") %></h6>
+  <h5><%= _("Use an existing installation medium") %></h5>
   <%= f.fields_for :hostgroup do |hgf| %>
     <%= select_f hgf, :medium_id, Medium.all, :id, :name, {:include_blank => true}, {:label => _("Existing medium")} %>
   <% end %>
 
-  <h6><%= _("Create new installation medium") %></h6>
+  <h5><%= _("Create new installation medium") %></h5>
   <%= f.fields_for :create_medium, @medium do |mf| %>
     <%= text_f mf, :name, :onchange => 'setup_media_create_change(this)' %>
-
-    <%= label_tag('', :class => 'radio inline') do %>
-      <% radio_button_tag(:medium_type, :path, true, :onchange => 'setup_media_change(this); setup_media_create_change(this)') + _("Normal installation media") %>
-    <% end %>
     <%= text_f mf, :path, :label => _("Path or URL") %>
-
-    <%= label_tag('', :class => 'radio inline') do %>
-      <% radio_button_tag(:medium_type, :spacewalk, false, :onchange => 'setup_media_change(this); setup_media_create_change(this)') + _("Red Hat Satellite 5 or Spacewalk") %>
-    <% end %>
-    <%= field(f, :spacewalk_hostname, :label => _("Hostname")) { text_field_tag :spacewalk_hostname, nil, :disabled => true } %>
-  <% end %>
-
-  <h4><%= _("Activation key configuration") %></h4>
-  <p><%= _("Users of Spacewalk, Red Hat Network, or Red Hat Satellite 5 should enter an appropriate activation key below, otherwise leave blank.") %></p>
-  <%= f.fields_for :satellite_type, @satellite_type do |stf| %>
-    <%= selectable_f stf, :value, [['Red Hat Satellite or Spacewalk', 'site'], ['Red Hat Network', 'hosted']], {:include_blank => true}, {:label => _("Type")} %>
-  <% end %>
-  <%= f.fields_for :activation_key, @activation_key do |akf| %>
-    <%= text_f akf, :value, :label => _("Activation key") %>
   <% end %>
 
   <%= submit_or_cancel f, false, {:cancel_path => foreman_setup_provisioners_path, :disabled => !(f.object.host.present? && f.object.smart_proxy.present?)} %>

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

@@ -1,8 +1,8 @@
 <% title _("Provisioning setup") %>
 
-<% title_actions display_link_if_authorized(_("Set up provisioning"), hash_for_new_foreman_setup_provisioner_path), help_path %>
+<% title_actions new_link(_("Set up provisioning")) %>
 
-<table class="table table-bordered table-striped">
+<table class="<%= table_css_classes %>">
   <tr>
     <th><%= sort :name, :as => _("Provisioning host") %></th>
     <th><%=  _("Smart proxy") %></th>
@@ -14,7 +14,7 @@
       <td><%= link_to_if_authorized h(prov.host.to_s), hash_for_edit_foreman_setup_provisioner_path(prov)%></td>
       <td><%= prov.smart_proxy.try(:name) %></td>
       <td><%= "#{prov.subnet.name} (#{prov.subnet.to_label})" if prov.subnet.present? %></td>
-      <td><%= display_delete_if_authorized hash_for_foreman_setup_provisioner_path(prov), :confirm => _("Delete %s?") % prov.host.to_s %></td>
+      <td><%= action_buttons(display_delete_if_authorized(hash_for_foreman_setup_provisioner_path(prov), :confirm => _("Delete %s?") % prov.host.to_s)) %></td>
     </tr>
   <% end %>
 </table>

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.9.0'
+        requires_foreman '>= 1.12.0'
 
         menu :top_menu, :provisioners, :url_hash => {:controller=> :'foreman_setup/provisioners', :action=>:index},
                  :caption=> N_('Provisioning setup'),
@@ -36,13 +36,6 @@ module ForemanSetup
       locale_domain = 'foreman_setup'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
-
-    initializer 'foreman_setup.assets.precompile' do |app|
-      app.config.assets.precompile += ['foreman_setup/false.png']
-    end
-    initializer 'foreman_setup.configure_assets', group: :assets do
-      SETTINGS[:foreman_setup] = { assets: { precompile: ['foreman_setup/false.png'] } }
-    end
   end
 
   def table_name_prefix

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '3.1.1'
+  VERSION = '4.0.0'
 end

data/test/functional/foreman_setup/provisioners_controller_test.rb

@@ -124,8 +124,6 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
     attrs = {
       :hostgroup_attributes => {},
       :create_medium => {:name => 'test', :path => 'http://mirror.example.com'},
-      :activation_key => {},
-      :satellite_type => {},
     }
     put :step4_update, {:id => prov.id, 'foreman_setup_provisioner' => attrs}, set_session_user
     assert_redirected_to step5_foreman_setup_provisioner_path(prov)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that helps set up provisioning.
 email: dcleal@redhat.com
@@ -23,7 +23,6 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
-- app/assets/images/foreman_setup/false.png
 - app/controllers/foreman_setup/provisioners_controller.rb
 - app/helpers/foreman_setup/provisioner_helper.rb
 - app/models/foreman_setup/provisioner.rb