diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-11 15:15:47 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-11 15:15:47 +0100 |
| commit | 98776befc7635f5a92670f66e991d39e8beb599e (patch) | |
| tree | ed752a35ca41dacdf1025f1f706e884ac6aecfab | |
| parent | 97e618665a5df3c5c209620ea1c8cd36d9747ae3 (diff) | |
| download | Puppet-98776befc7635f5a92670f66e991d39e8beb599e.tar.gz Puppet-98776befc7635f5a92670f66e991d39e8beb599e.tar.zst Puppet-98776befc7635f5a92670f66e991d39e8beb599e.zip | |
Fix puppet version
| -rw-r--r-- | modules/base_installation/manifests/packages.pp | 2 | ||||
| -rw-r--r-- | modules/base_installation/manifests/puppet.pp | 4 |
2 files changed, 3 insertions, 3 deletions
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 { | |||
| 6 | ensure_packages(['openssh', 'grub', 'sudo']) | 6 | ensure_packages(['openssh', 'grub', 'sudo']) |
| 7 | 7 | ||
| 8 | # Puppet dependencies | 8 | # Puppet dependencies |
| 9 | ensure_packages(['git', 'puppet']) | 9 | ensure_packages(['git', 'puppet5']) |
| 10 | 10 | ||
| 11 | # To run jobs | 11 | # To run jobs |
| 12 | ensure_packages(['at']) | 12 | 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 ( | |||
| 75 | 75 | ||
| 76 | file { $base_installation::puppet_conf_path: | 76 | file { $base_installation::puppet_conf_path: |
| 77 | ensure => directory, | 77 | ensure => directory, |
| 78 | require => [Package["puppet"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]], | 78 | require => [Package["puppet5"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]], |
| 79 | recurse => true, | 79 | recurse => true, |
| 80 | purge => true, | 80 | purge => true, |
| 81 | force => true, | 81 | force => true, |
| @@ -110,7 +110,7 @@ class base_installation::puppet ( | |||
| 110 | 110 | ||
| 111 | file { $base_installation::puppet_notifies_path: | 111 | file { $base_installation::puppet_notifies_path: |
| 112 | ensure => directory, | 112 | ensure => directory, |
| 113 | require => [Package["puppet"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]], | 113 | require => [Package["puppet5"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]], |
| 114 | recurse => true, | 114 | recurse => true, |
| 115 | purge => true, | 115 | purge => true, |
| 116 | force => true, | 116 | force => true, |