aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-08-09 10:44:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-08-09 10:44:24 -0300
commit0a86babf11201616f44fc4b67fbcce83837fd79b (patch)
tree613ed2c1254703e98e34c5ad3b59af2f5e40ba0a /manifests
parent1cc5e5207b473c4c2f859bd883b889d36c3b5521 (diff)
downloadpuppet-nodo-0a86babf11201616f44fc4b67fbcce83837fd79b.tar.gz
puppet-nodo-0a86babf11201616f44fc4b67fbcce83837fd79b.tar.bz2
Ensure network-manager is stopped depending on hiera config at nodo::utils::desktop::gnome (2)
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/desktop/gnome.pp8
1 files changed, 7 insertions, 1 deletions
diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index 95b8211..a853530 100644
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -3,7 +3,7 @@ class nodo::utils::desktop::gnome {
ensure => installed,
}
- $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'absent')
+ $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'installed')
# Network manager is a gnome dependency and we should disable it if the machine
# is using gnome but other networking tool to avoid conflicts.
@@ -13,4 +13,10 @@ class nodo::utils::desktop::gnome {
enable => false,
}
}
+ else {
+ service { 'network-manager':
+ ensure => running,
+ enable => true,
+ }
+ }
}