From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Fri, 11 Jan 2019 14:15:47 +0000 (+0100)
Subject: Fix puppet version
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=98776befc7635f5a92670f66e991d39e8beb599e

Fix puppet version
---

diff --git a/modules/base_installation/manifests/packages.pp b/modules/base_installation/manifests/packages.pp
index b0c976f..3ab8e7d 100644
--- a/modules/base_installation/manifests/packages.pp
+++ b/modules/base_installation/manifests/packages.pp
@@ -6,7 +6,7 @@ class base_installation::packages inherits base_installation {
   ensure_packages(['openssh', 'grub', 'sudo'])
 
   # Puppet dependencies
-  ensure_packages(['git', 'puppet'])
+  ensure_packages(['git', 'puppet5'])
 
   # To run jobs
   ensure_packages(['at'])
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index 603a961..a806217 100644
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -75,7 +75,7 @@ class base_installation::puppet (
 
     file { $base_installation::puppet_conf_path:
       ensure  => directory,
-      require => [Package["puppet"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]],
+      require => [Package["puppet5"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]],
       recurse => true,
       purge   => true,
       force   => true,
@@ -110,7 +110,7 @@ class base_installation::puppet (
 
     file { $base_installation::puppet_notifies_path:
       ensure  => directory,
-      require => [Package["puppet"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]],
+      require => [Package["puppet5"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]],
       recurse => true,
       purge   => true,
       force   => true,