foreman_setup 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf21d036debd554c2c8517fa5f90702d9c0582c
-  data.tar.gz: 3f22698d58ca143812e14872ab06194e6f98045b
+  metadata.gz: 4650b2e87fc4a1a4860318ae3b1108f6438a228c
+  data.tar.gz: 8ed548254d9b7dfc97894d4d65a346610468f608
 SHA512:
-  metadata.gz: 6c2045d0b9e7790f6704437cdfbee16c822951be1cfb670644cc93855e77d2bfdaf63a781ca24d84543d2d3133984fd9406e372c24bc734b573f121dfbd1b647
-  data.tar.gz: d6fd914ffdc7f7686596682f3bcd7999d07b964bd7f201091f67687ac24f84d5e7548109d4bb2b9b960697a4b3f4d52935329811bbea3ac504105eb702e71212
+  metadata.gz: 85b66ca8fbaabc8e82dd15314af8473e02e29e79e3d63fe6b5725c209880fe295f027389cef5a139af1399c8ce3a1600ad2f8dfab3074db0d69e7ced28a77e28
+  data.tar.gz: 82c66e7488995bdc1dd8f2a78af5350e62e06a9893a7f3117cb047f065360c85215364713b1f2c209f5d3d92a00d24aba80881f7cb8631fa53eefc72b14462cd

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.0.4
+* use foreman_url from settings, not browser URL for installer base URL
+* associate finish templates
+* remove JavaScript assets (#12)
+
 ## v2.0.3
 * fix Facter 2 compatibility
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -147,19 +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
         ipxe_tmpl_name = 'Kickstart'
-        ptable_name = foreman14 ? 'Kickstart default' : 'RedHat default'
+        finish_tmpl_name = 'Kickstart default finish'
+        ptable_name = 'Kickstart default'
       elsif @provisioner.host.os.family == 'Debian'
         tmpl_name = provision_tmpl_name = 'Preseed'
-        ptable_name = foreman14 ? 'Preseed default' : 'Ubuntu default'
+        finish_tmpl_name = 'Preseed default finish'
+        ptable_name = 'Preseed default'
       end
 
-      ipxe_kind = foreman14 ? 'iPXE' : 'gPXE'
-      {'provision' => provision_tmpl_name, 'PXELinux' => tmpl_name, ipxe_kind => ipxe_tmpl_name}.each do |kind_name, tmpl_name|
+      {'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 = ConfigTemplate.where('name LIKE ?', "#{tmpl_name}%").where(:template_kind_id => kind.id)

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

@@ -23,7 +23,7 @@ foreman-installer \
   --foreman-proxy-dns-zone=<%= provisioner.domain.name %> \
   --foreman-proxy-dns-reverse=<%= provisioner.rdns_zone %> \
 <%= provisioner.dns_forwarders.map { |f| "  --foreman-proxy-dns-forwarders=#{f} \\" }.join("\n") %>
-  --foreman-proxy-foreman-base-url=<%= root_url(:only_path => false).chomp('/') %> \
+  --foreman-proxy-foreman-base-url=<%= Setting[:foreman_url] %> \
   --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \
   --foreman-proxy-oauth-consumer-secret=<%= Setting[:oauth_consumer_secret] %>
 </pre>
@@ -41,7 +41,7 @@ foreman-installer \
   --foreman-proxy-dns-zone=<%= provisioner.domain.name %> \
   --foreman-proxy-dns-reverse=<%= provisioner.rdns_zone %> \
 <%= provisioner.dns_forwarders.map { |f| "  --foreman-proxy-dns-forwarders=#{f} \\" }.join("\n") %>
-  --foreman-proxy-foreman-base-url=<%= root_url(:only_path => false).chomp('/') %> \
+  --foreman-proxy-foreman-base-url=<%= Setting[:foreman_url] %> \
   --foreman-proxy-oauth-consumer-key=<%= Setting[:oauth_consumer_key] %> \
   --foreman-proxy-oauth-consumer-secret=<%= Setting[:oauth_consumer_secret] %>
 </pre>

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

@@ -1,4 +1,18 @@
-<%= javascript 'foreman_setup/provisioner' %>
+<%= javascript_tag do %>
+  function setup_media_change(ele) {
+    if ($(ele).val() == 'spacewalk') {
+      $('[id$="medium_path"]').prop('disabled', true)
+      $('#spacewalk_hostname').prop('disabled', false)
+    } else {
+      $('#spacewalk_hostname').prop('disabled', true)
+      $('[id$="medium_path"]').prop('disabled', false)
+    }
+  }
+
+  function setup_media_create_change(ele) {
+    $('[id$="medium_id"]').val('')
+  }
+<% end %>
 
 <%= form_for provisioner, :url => step4_update_foreman_setup_provisioner_path do |f| %>
   <%= base_errors_for provisioner %>

data/lib/foreman_setup/engine.rb

@@ -29,16 +29,6 @@ module ForemanSetup
         role "Provisioning setup", [:edit_provisioning]
       end
     end
-
-    initializer 'foreman_setup.configure_assets', :group => :assets do
-      SETTINGS[:setup] = {
-        :assets => {
-          :precompile => [
-            'foreman_setup/provisioner.js'
-          ],
-        }
-      }
-    end
   end
 
   def table_name_prefix

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -36,7 +36,6 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
-- app/assets/javascripts/foreman_setup/provisioner.js
 - app/controllers/foreman_setup/provisioners_controller.rb
 - app/helpers/foreman_setup/provisioner_helper.rb
 - app/models/foreman_setup/provisioner.rb

data/app/assets/javascripts/foreman_setup/provisioner.js

@@ -1,13 +0,0 @@
-function setup_media_change(ele) {
-  if ($(ele).val() == 'spacewalk') {
-    $('[id$="medium_path"]').prop('disabled', true)
-    $('#spacewalk_hostname').prop('disabled', false)
-  } else {
-    $('#spacewalk_hostname').prop('disabled', true)
-    $('[id$="medium_path"]').prop('disabled', false)
-  }
-}
-
-function setup_media_create_change(ele) {
-  $('[id$="medium_id"]').val('')
-}