Refactor base installation module

[perso/Immae/Projets/Puppet.git] / modules / base_installation / manifests / grub.pp

diff --git a/modules/grub_install/manifests/init.pp b/modules/base_installation/manifests/grub.pp
similarity index 50%
rename from modules/grub_install/manifests/init.pp
rename to modules/base_installation/manifests/grub.pp
index 172cf4b16a82e9c0b6cde99e9352dd63390fc208..0a96aa7d7b1020f53b096e9fcc971b325c8dde96 100644 (file)
--- a/modules/grub_install/manifests/init.pp
+++ b/modules/base_installation/manifests/grub.pp
@@ -1,11 +1,9 @@
-class grub_install (
-  $device = undef
-) {
+class base_installation::grub inherits base_installation {
   ensure_packages(['grub'])
 
-  # unless empty($device) {
+  # unless empty($base_installation::grub_device) {
   #   exec { 'install GRUB':
-  #     command   => "/usr/bin/grub-install --target=i386-pc $device",
+  #     command   => "/usr/bin/grub-install --target=i386-pc $base_installation::device",
   #     subscribe => Package["grub"],
   #   }
   # }
@@ -15,15 +13,6 @@ class grub_install (
     line  => 'GRUB_CMDLINE_LINUX=" console=tty0 console=ttyS0,115200"',
     match => '^GRUB_CMDLINE_LINUX='
   }
-  # file { "/etc/default/grub":
-  #   ensure => "present",
-  #   path   => "/etc/default/grub",
-  #   source => 'puppet:///modules/grub_install/config',
-  #   mode   => "0644",
-  #   owner  => "root",
-  #   group  => "root",
-  #   #  notify => [Exec["install GRUB"], Exec["update GRUB config"]]
-  # }
 
   # exec { 'update GRUB config':
   #   command     => "/usr/bin/grub-mkconfig -o /boot/grub/grub.cfg",