summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-15 21:44:28 +0100
committervarac <varacanero@zeromail.org>2015-12-15 21:44:28 +0100
commit0edaa5c1fb65a8c3d69b51c6b76bba8d7f9152f0 (patch)
tree098bbca6731c34d2cb2b17062152d2e8322f2999 /puppet
parent8a8dcda0fa10a819a945c283ef998214e5807f86 (diff)
parentd7ff99a1e8dfc5665f1bb94bc6bf4b369ea3a1ec (diff)
Merge branch 'dont_remove_nfs_client_on_vagrant' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/packages/base.pp12
1 files changed, 9 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index c23495fc..b53a9364 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -8,12 +8,18 @@ class site_config::packages::base {
}
# base set of packages that we want to remove everywhere
- package { [ 'acpi', 'eject', 'ftp',
- 'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
- 'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
+ package { [ 'acpi', 'eject', 'ftp', 'laptop-detect', 'lpr',
+ 'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat',
'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
'tk8.5', 'os-prober', 'unzip', 'xauth', 'x11-common',
'x11-utils', 'xterm' ]:
ensure => absent;
}
+
+ notice($::site_config::params::environment)
+ if $::site_config::params::environment != 'local' {
+ package { [ 'nfs-common', 'nfs-kernel-server', 'rpcbind' ]:
+ ensure => purged;
+ }
+ }
}