aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-08-08 16:31:56 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-08-08 16:31:56 -0300
commit1cc5e5207b473c4c2f859bd883b889d36c3b5521 (patch)
tree0fd9c996d4399bb498db98c29feb1750acc5ab00 /manifests/utils
parentb1a9adea82ec33c2f43a192f35245463e8f07530 (diff)
downloadpuppet-nodo-1cc5e5207b473c4c2f859bd883b889d36c3b5521.tar.gz
puppet-nodo-1cc5e5207b473c4c2f859bd883b889d36c3b5521.tar.bz2
Ensure network-manager is stopped depending on hiera config at nodo::utils::desktop::gnome
Diffstat (limited to 'manifests/utils')
-rw-r--r--manifests/utils/desktop/gnome.pp11
1 files changed, 11 insertions, 0 deletions
diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index 3542f34..95b8211 100644
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -2,4 +2,15 @@ class nodo::utils::desktop::gnome {
package { [ 'gnome', 'gnome-backgrounds' ]:
ensure => installed,
}
+
+ $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'absent')
+
+ # Network manager is a gnome dependency and we should disable it if the machine
+ # is using gnome but other networking tool to avoid conflicts.
+ if ($network_manager == 'absent') {
+ service { 'network-manager':
+ ensure => stopped,
+ enable => false,
+ }
+ }
}