From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 31 May 2014 16:00:34 +0000 (+0200)
Subject: autofs for lw0[56]
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bc6fb8fdf45175d7f71f7fb5155c6ebc4cb2f6e0;p=dsa-puppet.git

autofs for lw0[56]
---

diff --git a/modules/autofs/files/leaseweb/auto.dsa b/modules/autofs/files/leaseweb/auto.dsa
new file mode 100644
index 00000000..53edd6db
--- /dev/null
+++ b/modules/autofs/files/leaseweb/auto.dsa
@@ -0,0 +1,4 @@
+snapshot-1              -fstype=nfs,ro,tcp     10.0.0.1:/storage/snapshot-farm-1
+snapshot-2              -fstype=nfs,ro,tcp     10.0.0.2:/storage/snapshot-farm-2
+snapshot-3              -fstype=nfs,ro,tcp     10.0.0.3:/storage/snapshot-farm-3
+snapshot-4              -fstype=nfs,ro,tcp     10.0.0.4:/storage/snapshot-farm-4
diff --git a/modules/autofs/files/leaseweb/auto.master.d-dsa.autofs b/modules/autofs/files/leaseweb/auto.master.d-dsa.autofs
new file mode 100644
index 00000000..5e7f5741
--- /dev/null
+++ b/modules/autofs/files/leaseweb/auto.master.d-dsa.autofs
@@ -0,0 +1 @@
+/auto.dsa /etc/auto.dsa
diff --git a/modules/autofs/manifests/bytemark.pp b/modules/autofs/manifests/bytemark.pp
index d52a4587..78bf6734 100644
--- a/modules/autofs/manifests/bytemark.pp
+++ b/modules/autofs/manifests/bytemark.pp
@@ -1,18 +1,6 @@
 class autofs::bytemark {
-	package { 'autofs': ensure => installed }
-	package { 'nfs-common': ensure => installed }
+	include autofs::common
 
-	exec { 'autofs reload':
-		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => 'service autofs reload',
-		refreshonly => true,
-		require =>  Package['autofs'],
-	}
-
-
-	file { '/etc/auto.master.d':
-		ensure  => directory
-	}
 	file { '/etc/auto.master.d/dsa.autofs':
 		source  => "puppet:///modules/autofs/bytemark/auto.master.d-dsa.autofs",
 		notify  => Exec['autofs reload']
diff --git a/modules/autofs/manifests/common.pp b/modules/autofs/manifests/common.pp
new file mode 100644
index 00000000..706b2042
--- /dev/null
+++ b/modules/autofs/manifests/common.pp
@@ -0,0 +1,16 @@
+class autofs::bytemark {
+	package { 'autofs': ensure => installed }
+	package { 'nfs-common': ensure => installed }
+
+	exec { 'autofs reload':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'service autofs reload',
+		refreshonly => true,
+		require =>  Package['autofs'],
+	}
+
+
+	file { '/etc/auto.master.d':
+		ensure  => directory
+	}
+}
diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index cac1bea6..18b87114 100644
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,5 +1,10 @@
 class autofs {
-	if $::hostname in [pejacevic, piu-slave-bm-a, picconi, coccia, couper, dillon, donizetti, ticharich, delfin, quantz] {
-		include autofs::bytemark
+	case $::hostname {
+		pejacevic, piu-slave-bm-a, picconi, coccia, couper, dillon, donizetti, ticharich, delfin, quantz: {
+			include autofs::bytemark
+		}
+		lw05,lw06: {
+			include autofs::leaseweb
+		}
 	}
 }
diff --git a/modules/autofs/manifests/leaseweb.pp b/modules/autofs/manifests/leaseweb.pp
new file mode 100644
index 00000000..d20194ff
--- /dev/null
+++ b/modules/autofs/manifests/leaseweb.pp
@@ -0,0 +1,12 @@
+class autofs::bytemark {
+	include autofs::common
+
+	file { '/etc/auto.master.d/dsa.autofs':
+		source  => "puppet:///modules/autofs/leaseweb/auto.master.d-dsa.autofs",
+		notify  => Exec['autofs reload']
+	}
+	file { '/etc/auto.dsa':
+		source  => "puppet:///modules/autofs/leaseweb/auto.dsa",
+		notify  => Exec['autofs reload']
+	}
+}