snapshot_web -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c4ccc91..b24dc1b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -179,9 +179,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  snapshot_web:
-    - lw07.debian.org
-    - sallinen.debian.org
 
 classes:
   - base::includes

diff --git a/hieradata/nodes/lw07.debian.org.yaml b/hieradata/nodes/lw07.debian.org.yaml
new file mode 100644 (file)
index 0000000..1244b0c
--- /dev/null
+++ b/hieradata/nodes/lw07.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_web

diff --git a/hieradata/nodes/sallinen.debian.org.yaml b/hieradata/nodes/sallinen.debian.org.yaml
new file mode 100644 (file)
index 0000000..1244b0c
--- /dev/null
+++ b/hieradata/nodes/sallinen.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_web

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fefab3f..583ad92 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -78,10 +78,6 @@ class roles {
                include roles::snapshot
        }
 
-       if has_role('snapshot_web') {
-               include roles::snapshot_web
-       }
-
        if has_role('ports_master') {
                include roles::ports_master
        }