foreman_bootdisk 1.2.1 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +4 -0
  3. data/app/controllers/concerns/bootdisk/unattended_controller_ext.rb +1 -1
  4. data/app/services/bootdisk/iso_generator.rb +5 -0
  5. data/lib/bootdisk/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8a87816866ed51776fc4c8ac41dda8c95ba54af3
4
- data.tar.gz: 109d8a3cda12ef381176764b44995695c5bd4497
3
+ metadata.gz: 0e7ca62988c19718f543895b4428bb0700334cbc
4
+ data.tar.gz: 31bf9786b3162c9b92e2c90c3fb0c91339b26831
5
5
  SHA512:
6
- metadata.gz: f1a26019f843ce8b8aa63ecfd5ffe4903924838e992c6e1f18e802412e7a1cf0ced908b6aa5620ce82018b399eadf93874d6251a89cbd2f230e2d02bceeea42e
7
- data.tar.gz: 614523701c49a45f4c6bad05aa10ee699a97aed34cb35e105282c5082e354cd5a070d05d72787c936adeb9b9451076c43b3a4209aa9a9eb235d8fd721216b0ee
6
+ metadata.gz: d350499749f54362a32c3ba1497c6eda779c19cfc97f127110568a040389d6aafddde5c37cfdc0f7d657114e89a10daf705e355ef718e625728f9439bec50b0e
7
+ data.tar.gz: 362c580e40e8a2c4201f170a6489ce97af0181cb24ddd3c1760dbc55edfc10d9d20dd994e12670f155d0c8c6932cb56eb699a1e29512fc16f3908d43ff0a71e9
data/CHANGES.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## v1.2.2
4
+ * check ipxe/syslinux are present when generating images (#3195)
5
+ * fix RHN_PROVISIONING_MAC_0 error on template retrieval
6
+
3
7
  ## v1.2.1
4
8
  * add permission and default role for non-admin users
5
9
  * fix DB migration from clean install
data/app/controllers/concerns/bootdisk/unattended_controller_ext.rb CHANGED
@@ -6,7 +6,7 @@ module Bootdisk::UnattendedControllerExt
6
6
  end
7
7
 
8
8
  def find_host_by_ip_or_mac_with_param_mac
9
- request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0')
9
+ request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0') || params['mac'].nil?
10
10
  find_host_by_ip_or_mac_without_param_mac
11
11
  end
12
12
  end
data/app/services/bootdisk/iso_generator.rb CHANGED
@@ -20,6 +20,11 @@ initrd /script
20
20
  EOF
21
21
  end
22
22
 
23
+ unless (File.exists?(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn')) &&
24
+ (File.exists?(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'))))
25
+ raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
26
+ end
27
+
23
28
  FileUtils.cp(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'), File.join(wd, 'build', 'isolinux.bin'))
24
29
  FileUtils.cp(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'), File.join(wd, 'build', 'ipxe'))
25
30
  File.open(File.join(wd, 'build', 'script'),'w') { |file| file.write(script) }
data/lib/bootdisk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bootdisk
2
- VERSION = '1.2.1'
2
+ VERSION = '1.2.2'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_bootdisk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dominic Cleal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-24 00:00:00.000000000 Z
11
+ date: 2013-10-07 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
14
14
  without the need for PXE infrastructure.