pubsub -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7796a1b..ca45b2d 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -73,9 +73,6 @@ roles:
     - quantz.debian.org
   popcon:
     - pinel.debian.org
-  pubsub:
-    - rainier.debian.org
-    - rapoport.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:

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

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d298086..63ec89d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -78,10 +78,6 @@ class roles {
                include roles::mailrelay
        }
 
-       if has_role('pubsub') {
-               include roles::pubsub
-       }
-
        if has_role('dns_primary') {
                include roles::dns_primary
        }