aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 22:43:28 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 22:43:28 +0200
commit66e7b1e6d508e7d6f5517652110a3e2e03bb3c47 (patch)
tree8593e5586760afd3a4bac9f4f567b9b29e757604
parent0e0ea47231c04d0634618de89dfa6f500bc3a3cb (diff)
downloadPuppet-66e7b1e6d508e7d6f5517652110a3e2e03bb3c47.tar.gz
Puppet-66e7b1e6d508e7d6f5517652110a3e2e03bb3c47.tar.zst
Puppet-66e7b1e6d508e7d6f5517652110a3e2e03bb3c47.zip
Ovh cleanup
-rw-r--r--modules/base_packages/manifests/init.pp17
-rw-r--r--modules/ovh_cleanup/manifests/init.pp11
2 files changed, 28 insertions, 0 deletions
diff --git a/modules/base_packages/manifests/init.pp b/modules/base_packages/manifests/init.pp
index f1e76ae..a49d211 100644
--- a/modules/base_packages/manifests/init.pp
+++ b/modules/base_packages/manifests/init.pp
@@ -1,10 +1,27 @@
1class base_packages { 1class base_packages {
2 # Preinstalled
3 package { 'base':
4 ensure => 'latest',
5 }
6 package { 'openssh':
7 ensure => 'latest',
8 }
9 package { 'grub':
10 ensure => 'latest',
11 }
12 package { 'sudo':
13 ensure => 'latest',
14 }
15
16 # Puppet dependencies
2 package { 'git': 17 package { 'git':
3 ensure => 'latest', 18 ensure => 'latest',
4 } 19 }
5 package { 'puppet': 20 package { 'puppet':
6 ensure => 'latest', 21 ensure => 'latest',
7 } 22 }
23
24 # Needed by puppet module
8 package { 'cronie': 25 package { 'cronie':
9 ensure => 'latest', 26 ensure => 'latest',
10 } 27 }
diff --git a/modules/ovh_cleanup/manifests/init.pp b/modules/ovh_cleanup/manifests/init.pp
index 0704cf9..b7ecb50 100644
--- a/modules/ovh_cleanup/manifests/init.pp
+++ b/modules/ovh_cleanup/manifests/init.pp
@@ -21,6 +21,9 @@ class ovh_cleanup {
21 file { '/etc/pacman.d/gnupg': 21 file { '/etc/pacman.d/gnupg':
22 ensure => 'present', 22 ensure => 'present',
23 } 23 }
24 file { '/usr/bin/growpart':
25 ensure => 'absent',
26 }
24 file { '/usr/bin/reanimate-pacman': 27 file { '/usr/bin/reanimate-pacman':
25 ensure => 'absent', 28 ensure => 'absent',
26 require => File['/etc/pacman.d/gnupg'], 29 require => File['/etc/pacman.d/gnupg'],
@@ -39,6 +42,14 @@ class ovh_cleanup {
39 file { '/etc/resolv.conf.pacorig': 42 file { '/etc/resolv.conf.pacorig':
40 ensure => 'absent' 43 ensure => 'absent'
41 } 44 }
45 package { 'haveged':
46 ensure => 'absent',
47 uninstall_options => [ '-s', '-c']
48 }
49 package { 'parted':
50 ensure => 'absent',
51 uninstall_options => [ '-s', '-c']
52 }
42 53
43 54
44 file { '/etc/udev/rules.d/80-net-setup-link.rules': 55 file { '/etc/udev/rules.d/80-net-setup-link.rules':