From f11427319129451ff2cb2a7c986b70f4cdc0121a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 3 Mar 2014 11:52:40 +0100
Subject: ssh and bastion for sunet

---
 global/overlay/etc/puppet/cosmos-rules.yaml        | 2 +-
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'global')

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 137bd28..0271f1f 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -5,4 +5,4 @@
    sunet-cdr:
    sunet:
 '\.swamid\.se$':
-   swamid:
+   sunet:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 69ac954..ab24b11 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -315,7 +315,3 @@ class sunet-cdr {
    class { 'sunet-dhcp-hosts': }
 
 }
-
-class swamid {
-   sunet::server { 'sunet_server': }
-}
-- 
cgit v1.1