foreman_setup 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108b7d028caf95892e9856dd30375168c0c9ae16
-  data.tar.gz: ba67990cf75080f773c8dbef65e9032979d02577
+  metadata.gz: da5e328806b88cd3747ffbc70cae928ce9c5c8b2
+  data.tar.gz: e9e716397bd1c04ebfa7264dc4a18000d84b2211
 SHA512:
-  metadata.gz: fedee3f1c689216802fead638c898245f7e402bc9e8d9b650f8f162400db04e287038aa8d8abd2410fb6629e0109ab85c61b9fb0806fcf74c0ce001983367e27
-  data.tar.gz: e2ff682c30a5fbb28aeb1669475df93e50eab3c048c9675b901c1d722ab7bbe12bbb411251d41613a914f0b5cb8cb21d32cc753dc36357a1c645db7af89d2c92
+  metadata.gz: eddc32856664befabe4461e7e6abc8fc70727daababd8d65c022067df211674ad6123bf2ebb05647c1eba923ee8be16ea12660e72108bab80a18b07a5765e66b
+  data.tar.gz: 7f3c04ade6e8c10a592492334c40eb9d496c7748e63a640b544c5e1bb548dc290142223a44b4e3a3b1d25adf6114b8a6eb40fbba73191e96c5592ac45e5e9fb9

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.0.4
+* further Foreman 1.4 fixes, template renames and CSS
+
 ## v1.0.3
 * fix Foreman 1.4 compatibility
 * add basic role and permission under Foreman 1.4

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -147,17 +147,19 @@ module ForemanSetup
       end
 
       # Associate templates with OS and vice-versa
+      foreman14 = SETTINGS[:version].is_a? Foreman::Version
       if @provisioner.host.os.family == 'Redhat'
         tmpl_name = 'Kickstart'
         provision_tmpl_name = @provisioner.host.os.name == 'Redhat' ? 'RHEL Kickstart' : tmpl_name
-        gpxe_tmpl_name = 'Kickstart'
-        ptable_name = 'RedHat default'
+        ipxe_tmpl_name = 'Kickstart'
+        ptable_name = foreman14 ? 'Kickstart default' : 'RedHat default'
       elsif @provisioner.host.os.family == 'Debian'
         tmpl_name = provision_tmpl_name = 'Preseed'
-        ptable_name = 'Ubuntu default'
+        ptable_name = foreman14 ? 'Preseed default' : 'Ubuntu default'
       end
 
-      {'provision' => provision_tmpl_name, 'PXELinux' => tmpl_name, 'gPXE' => gpxe_tmpl_name}.each do |kind_name, tmpl_name|
+      ipxe_kind = foreman14 ? 'iPXE' : 'gPXE'
+      {'provision' => provision_tmpl_name, 'PXELinux' => tmpl_name, ipxe_kind => ipxe_tmpl_name}.each do |kind_name, tmpl_name|
         next if tmpl_name.blank?
         kind = TemplateKind.find_by_name(kind_name)
         tmpls = ConfigTemplate.where('name LIKE ?', "#{tmpl_name}%").where(:template_kind_id => kind.id)

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

@@ -15,8 +15,8 @@
   <h4><%= _("Next steps") %></h4>
 
   <%= option_button _("New Host"), new_host_path, :class => 'btn btn-success', :help_inline => _("Create and provision a new host") %>
-  <%= option_button _("Compute Resources"), compute_resources_path, :class => 'btn', :help_inline => _("Add and manage compute resources (virtualization and cloud)") %>
-  <%= option_button _("Edit Host Group"), edit_hostgroup_path(@provisioner.hostgroup), :class => 'btn', :help_inline => _("Review and edit the host group set up by the provisioning wizard") %>
-  <%= option_button _("Provisioning Setup"), foreman_setup_provisioners_path, :class => 'btn', :help_inline => _("Return to the main provisioning setup page") %>
+  <%= option_button _("Compute Resources"), compute_resources_path, :class => 'btn btn-default', :help_inline => _("Add and manage compute resources (virtualization and cloud)") %>
+  <%= option_button _("Edit Host Group"), edit_hostgroup_path(@provisioner.hostgroup), :class => 'btn btn-default', :help_inline => _("Review and edit the host group set up by the provisioning wizard") %>
+  <%= option_button _("Provisioning Setup"), foreman_setup_provisioners_path, :class => 'btn btn-default', :help_inline => _("Return to the main provisioning setup page") %>
 
 </div>

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Plugin for Foreman that helps set up provisioning.
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Helps set up Foreman for provisioning