X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=manifests%2Finstall_ovh.pp;h=a5adf44f2e562b50a5794cd1f764b098f0edc344;hb=ba2cf1b5d938810077b0fd73844faf432e8e8f9d;hp=48c3effdda3539492936ab1dcb436cae3ce4a06c;hpb=a880172b96e94f4f1c01d51d78305d712d1726b3;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/manifests/install_ovh.pp b/manifests/install_ovh.pp
index 48c3eff..a5adf44 100644
--- a/manifests/install_ovh.pp
+++ b/manifests/install_ovh.pp
@@ -1,12 +1,54 @@
 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':
-      apply => 'finished'
+      apply   => 'finished',
+      timeout => 0
     }
 }