Fix puppet version

diff --git a/modules/base_installation/manifests/packages.pp b/modules/base_installation/manifests/packages.pp
index b0c976f70eef6d716509784dc6e49b5ebfa0a3c6..3ab8e7d26c0d2667411fa96218f8565e4cd06277 100644 (file)
--- 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 603a96115b97493f9f4d71af639c059ed6537c60..a8062170d93215046ad2a67a18348ba89635070b 100644 (file)
--- 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,