cleanup class structuresunet-ops-2014-10-24-v09

2 files changed, 5 insertions, 12 deletions

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 6dbbbee..2851fb1 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -6,15 +6,17 @@
    swamidops:
    mailclient:
       domain: sunet.se
+'\.sunet\.se$':
+   sunet:
+   mailclient:
+      domain: sunet.se
 registry.swamid.se:
    dockerhost:
    webserver:
 datasets.sunet.se:
-   sunet:
    dockerhost:
    webserver:
 docker.sunet.se:
-   sunet:
    dockerhost:
    webserver:
 mdx1.swamid.se:
@@ -31,4 +33,3 @@ md-master.reep.refeds.org:
 '^random\d+\.nordu\.net$':
    entropyserver:
    quantis:
-   sunet:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 7646ea6..b634e8c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -484,7 +484,7 @@ class sunet {
 
   package { ['openssh-server', 'emacs23-nox']:
     ensure => 'installed'
-  } ->
+  }
 
   ufw::allow { 'allow-ssh-sunet':
     port  => '22',
@@ -583,14 +583,6 @@ class swamidops {
   }
 }
 
-node 'dane.lab.sunet.se' {
-   class {'sunet': }
-}
-
-node 'lobo2.lab.sunet.se' {
-   class {'sunet': }
-}
-
 node 'wp.sunet.se' {
   package {'libapache2-mod-php5': ensure => 'latest'}
   package {'php5-mysql': ensure => 'latest'}