Refactor base installation module

2 files changed, 3 insertions, 69 deletions

diff --git a/manifests/install_ovh.pp b/manifests/install_ovh.pp
deleted file mode 100644
index a5adf44..0000000
--- a/manifests/install_ovh.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-node default {
-    include stdlib
-
-    stage { 'base_configuration':
-      before => Stage['main']
-    }
-    stage { 'base_installation':
-      before => Stage['base_configuration']
-    }
-    stage { 'preparation':
-      before => Stage['base_installation']
-    }
-
-    class { 'etckeeper':
-      stage => 'preparation'
-    }
-    class { 'ovh_cleanup':
-      stage => 'preparation'
-    }
-    etckeeper::run { 'post_preparation_stage':
-      reason => "Post puppet preparation stage",
-      stages => [Stage['preparation']]
-    }
-
-    class { 'base_packages':
-      stage => "base_installation"
-    }
-    etckeeper::run { 'post_base_installation_stage':
-      reason => "Post puppet base installation stage",
-      stages => [Stage['base_installation']]
-    }
-
-    class { 'locales':
-      stage => "base_configuration"
-    }
-    class { 'cron_puppet':
-      stage => "base_configuration"
-    }
-    class { 'base_configuration':
-      stage => "base_configuration",
-      hostname => 'new.immae.eu'
-    }
-    etckeeper::run { 'post_base_configuration_stage':
-      reason => "Post puppet base configuration stage",
-      stages => [Stage['base_configuration']]
-    }
-
-    class { 'aur': }
-
-    reboot { 'after_run':
-      apply   => 'finished',
-      timeout => 0
-    }
-}
diff --git a/manifests/install_ovh_from_scratch.pp b/manifests/install_ovh_from_scratch.pp
index 4888cfc..f5224fa 100644
--- a/manifests/install_ovh_from_scratch.pp
+++ b/manifests/install_ovh_from_scratch.pp
@@ -1,20 +1,8 @@
 node default {
     include stdlib
 
-    stage { 'base_configuration': }
-    stage { 'base_packages': }
-    Stage["setup"]
-      -> Stage['base_packages']
-      -> Stage['base_configuration']
-      -> Stage['main']
- 
-    class { 'base_packages':
-      stage => "base_packages"
-    }
-    class { 'base_configuration':
-      stage     => "base_configuration",
-      code_path => "/etc/puppetlabs/code",
-      device    => "/dev/sdb",
-      hostname  => 'new.immae.eu',
+    class { 'base_installation':
+      stage       => "setup",
+      grub_device => "/dev/sdb",
     }
 }