Puppet-ironic automatic update

This module update commit was generated by Bade. For more info please check https://github.com/paramite/bade This commit is setting modules to following state: ironic - old commit: 2c8397256728024860fa9f9a2018b4b5f0d21f15 - new commit: 12e15ba21a296ac9778754ff3db6187a9c503045 Resolves: rhbz#1292504 Change-Id: I245bc18b36211c90d83ca5cb56e59df2086807fd Signed-off-by: Gael Chamoulaud <[email protected]>
xbezdick · Dec 22, 2015 · 7f57574 · 7f57574
1 parent 00e728c
commit 7f57574
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -99,7 +99,7 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '2c8397256728024860fa9f9a2018b4b5f0d21f15',
+  :commit => '12e15ba21a296ac9778754ff3db6187a9c503045',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'java',

diff --git a/ironic/manifests/drivers/pxe.pp b/ironic/manifests/drivers/pxe.pp
@@ -69,30 +69,36 @@
 #   Should be an valid directory
 #   Defaults to '/var/lib/ironic/master_images'.
 #
+# [*uefi_pxe_bootfile_name*]
+#   (optional) Bootfile DHCP parameter for UEFI boot mode.
+#   Defaults to 'elilo.efi'.
+#
 
 class ironic::drivers::pxe (
-  $deploy_kernel        = undef,
-  $deploy_ramdisk       = undef,
-  $pxe_append_params    = 'nofb nomodeset vga=normal',
-  $pxe_config_template  = '$pybasedir/drivers/modules/pxe_config.template',
-  $pxe_deploy_timeout   = '0',
-  $tftp_server          = '$my_ip',
-  $tftp_root            = '/tftpboot',
-  $images_path          = '/var/lib/ironic/images/',
-  $tftp_master_path     = '/tftpboot/master_images',
-  $instance_master_path = '/var/lib/ironic/master_images',
+  $deploy_kernel          = undef,
+  $deploy_ramdisk         = undef,
+  $pxe_append_params      = 'nofb nomodeset vga=normal',
+  $pxe_config_template    = '$pybasedir/drivers/modules/pxe_config.template',
+  $pxe_deploy_timeout     = '0',
+  $tftp_server            = '$my_ip',
+  $tftp_root              = '/tftpboot',
+  $images_path            = '/var/lib/ironic/images/',
+  $tftp_master_path       = '/tftpboot/master_images',
+  $instance_master_path   = '/var/lib/ironic/master_images',
+  $uefi_pxe_bootfile_name = 'elilo.efi',
 ) {
 
   # Configure ironic.conf
   ironic_config {
-    'pxe/pxe_append_params': value    => $pxe_append_params;
-    'pxe/pxe_config_template': value  => $pxe_config_template;
-    'pxe/pxe_deploy_timeout': value   => $pxe_deploy_timeout;
-    'pxe/tftp_server': value          => $tftp_server;
-    'pxe/tftp_root': value            => $tftp_root;
-    'pxe/images_path': value          => $images_path;
-    'pxe/tftp_master_path': value     => $tftp_master_path;
-    'pxe/instance_master_path': value => $instance_master_path;
+    'pxe/pxe_append_params': value      => $pxe_append_params;
+    'pxe/pxe_config_template': value    => $pxe_config_template;
+    'pxe/pxe_deploy_timeout': value     => $pxe_deploy_timeout;
+    'pxe/tftp_server': value            => $tftp_server;
+    'pxe/tftp_root': value              => $tftp_root;
+    'pxe/images_path': value            => $images_path;
+    'pxe/tftp_master_path': value       => $tftp_master_path;
+    'pxe/instance_master_path': value   => $instance_master_path;
+    'pxe/uefi_pxe_bootfile_name': value => $uefi_pxe_bootfile_name;
   }
 
   if $deploy_kernel {

diff --git a/ironic/spec/classes/ironic_drivers_pxe_spec.rb b/ironic/spec/classes/ironic_drivers_pxe_spec.rb
@@ -23,14 +23,15 @@
 describe 'ironic::drivers::pxe' do
 
   let :default_params do
-    { :pxe_append_params    => 'nofb nomodeset vga=normal',
-      :pxe_config_template  => '$pybasedir/drivers/modules/pxe_config.template',
-      :pxe_deploy_timeout   => '0',
-      :tftp_server          => '$my_ip',
-      :tftp_root            => '/tftpboot',
-      :images_path          => '/var/lib/ironic/images/',
-      :tftp_master_path     => '/tftpboot/master_images',
-      :instance_master_path => '/var/lib/ironic/master_images' }
+    { :pxe_append_params      => 'nofb nomodeset vga=normal',
+      :pxe_config_template    => '$pybasedir/drivers/modules/pxe_config.template',
+      :pxe_deploy_timeout     => '0',
+      :tftp_server            => '$my_ip',
+      :tftp_root              => '/tftpboot',
+      :images_path            => '/var/lib/ironic/images/',
+      :tftp_master_path       => '/tftpboot/master_images',
+      :instance_master_path   => '/var/lib/ironic/master_images',
+      :uefi_pxe_bootfile_name => 'elilo.efi' }
   end
 
   let :params do
@@ -51,6 +52,7 @@
       is_expected.to contain_ironic_config('pxe/images_path').with_value(p[:images_path])
       is_expected.to contain_ironic_config('pxe/tftp_master_path').with_value(p[:tftp_master_path])
       is_expected.to contain_ironic_config('pxe/instance_master_path').with_value(p[:instance_master_path])
+      is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value(p[:uefi_pxe_bootfile_name])
     end
 
     context 'when overriding parameters' do
@@ -65,7 +67,8 @@
           :tftp_root            => '/mnt/ftp',
           :images_path          => '/mnt/images',
           :tftp_master_path     => '/mnt/master_images',
-          :instance_master_path => '/mnt/ironic/master_images'
+          :instance_master_path => '/mnt/ironic/master_images',
+          :uefi_pxe_bootfile_name => 'bootx64.efi'
         )
       end
 
@@ -80,6 +83,7 @@
         is_expected.to contain_ironic_config('pxe/images_path').with_value(p[:images_path])
         is_expected.to contain_ironic_config('pxe/tftp_master_path').with_value(p[:tftp_master_path])
         is_expected.to contain_ironic_config('pxe/instance_master_path').with_value(p[:instance_master_path])
+        is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value(p[:uefi_pxe_bootfile_name])
       end
     end