Merge branch 'dont_remove_nfs_client_on_vagrant' into develop

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;
+    }
+  }
 }