Simplify wicd/network-manager handling

diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index a853530b59c6441239f3e754127e925c6f9ecc25..3542f3454c4d3440ab32a3b45585a98b442b54dc 100644 (file)
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -2,21 +2,4 @@ class nodo::utils::desktop::gnome {
   package { [ 'gnome', 'gnome-backgrounds' ]:
     ensure => installed,
   }
-
-  $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.
-  if ($network_manager == 'absent') {
-    service { 'network-manager':
-      ensure => stopped,
-      enable => false,
-    }
-  }
-  else {
-    service { 'network-manager':
-      ensure => running,
-      enable => true,
-    }
-  }
 }

diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp
index 948a34ccdfc59523247ae176663f4b2caad6579c..e42b9992dc82f6bd1934dcb4cb89b824aa8ec244 100644 (file)
--- a/manifests/utils/laptop/debian.pp
+++ b/manifests/utils/laptop/debian.pp
@@ -13,29 +13,4 @@ class nodo::utils::laptop::debian {
               'tcpdump',       'tshark' ]:
     ensure => installed,
   }
-
-  $wicd            = hiera('nodo::utils::laptop::debian::wicd',            'installed')
-  $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'absent')
-
-  # Wicd
-  package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
-    ensure => $wicd,
-  }
-
-  # Network manager
-  package { 'network-manager':
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => absent,
-       default  => $network_manager,
-    }
-  }
-
-  # Squeeze specific packages
-  package { [ 'kismet' ]:
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => installed,
-       default  => absent,
-    }
-  }
-
 }

diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
new file mode 100644 (file)
index 0000000..cb19af3
--- /dev/null
+++ b/manifests/utils/network/wicd.pp
@@ -0,0 +1,5 @@
+class nodo::utils::network::wicd {
+  package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
+    ensure => installed,
+  }
+}