From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 18:59:57 +0000 (+0200)
Subject: Put lw01,lw02,lw03,lw04,lw09,lw10 into a snapshot_base class and include that also... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=65d650901eaac374ab44ed3798825d98bd60009d

Put lw01,lw02,lw03,lw04,lw09,lw10 into a snapshot_base class and include that also from _web and _shell
---

diff --git a/data/nodes/lw01.debian.org.yaml b/data/nodes/lw01.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw01.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/data/nodes/lw02.debian.org.yaml b/data/nodes/lw02.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw02.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/data/nodes/lw03.debian.org.yaml b/data/nodes/lw03.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw03.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/data/nodes/lw04.debian.org.yaml b/data/nodes/lw04.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw04.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/data/nodes/lw09.debian.org.yaml b/data/nodes/lw09.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw09.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/data/nodes/lw10.debian.org.yaml b/data/nodes/lw10.debian.org.yaml
new file mode 100644
index 000000000..137033653
--- /dev/null
+++ b/data/nodes/lw10.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_base
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fb571c56f..a65e7a9f4 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,10 +15,6 @@ class roles {
 		include postgres::backup_server
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
-		include roles::snapshot
-	}
-
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}
diff --git a/modules/roles/manifests/snapshot.pp b/modules/roles/manifests/snapshot.pp
deleted file mode 100644
index 6b9fca4a6..000000000
--- a/modules/roles/manifests/snapshot.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class roles::snapshot {
-	ensure_packages ( ["build-essential", "python-dev", "libssl-dev"], { ensure => 'installed' })
-}
diff --git a/modules/roles/manifests/snapshot_base.pp b/modules/roles/manifests/snapshot_base.pp
new file mode 100644
index 000000000..7c812f795
--- /dev/null
+++ b/modules/roles/manifests/snapshot_base.pp
@@ -0,0 +1,3 @@
+class roles::snapshot_base {
+  ensure_packages ( ["build-essential", "python-dev", "libssl-dev"], { ensure => 'installed' })
+}
diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
index a832c9fc2..20152136d 100644
--- a/modules/roles/manifests/snapshot_shell.pp
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -1,4 +1,6 @@
 class roles::snapshot_shell {
+  include roles::snapshot_base
+
   # give ftpmaster/the dak user some environment so they can poll the
   # list of files we have
   file { '/etc/ssh/userkeys/dak':
diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index 9e71efd1e..b8b5408be 100644
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -1,4 +1,6 @@
 class roles::snapshot_web {
+  include roles::snapshot_base
+
   include apache2
   include apache2::rewrite