1 files changed, 41 insertions, 4 deletions

diff --git a/manifests/install_ovh.pp b/manifests/install_ovh.pp
index d1e109f..581e289 100644
--- a/manifests/install_ovh.pp
+++ b/manifests/install_ovh.pp
@@ -1,13 +1,50 @@
 node default {
     include stdlib
 
-    class { 'ovh_cleanup': }
-    class { 'base_packages': }
-    class { 'locales': }
-    class { 'cron_puppet': }
+    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':